summaryrefslogtreecommitdiff
path: root/YWD/src
diff options
context:
space:
mode:
Diffstat (limited to 'YWD/src')
-rwxr-xr-xYWD/src/main/java/fyresmodjam/ModjamMod.java2
-rwxr-xr-xYWD/src/main/java/fyresmodjam/handlers/FyresKeyHandler.java1
-rwxr-xr-xYWD/src/main/resources/assets/fyresmodjam/lang/en_US.lang3
3 files changed, 2 insertions, 4 deletions
diff --git a/YWD/src/main/java/fyresmodjam/ModjamMod.java b/YWD/src/main/java/fyresmodjam/ModjamMod.java
index aac2f32..7639210 100755
--- a/YWD/src/main/java/fyresmodjam/ModjamMod.java
+++ b/YWD/src/main/java/fyresmodjam/ModjamMod.java
@@ -394,7 +394,7 @@ public class ModjamMod extends CommandHandler {
EntityPlayer entityPlayer = event.entityPlayer;
if (entityPlayer != null && BlessingUtils.hasBlessing(entityPlayer)) {
- BlessingUtils.getBlessingInstance(BlessingUtils.getBlessing(entityPlayer)).checkBreakSpeed(event);
+ BlessingUtils.getBlessingInstance(entityPlayer).checkBreakSpeed(event);
}
}
diff --git a/YWD/src/main/java/fyresmodjam/handlers/FyresKeyHandler.java b/YWD/src/main/java/fyresmodjam/handlers/FyresKeyHandler.java
index 55cb2ed..23dfd16 100755
--- a/YWD/src/main/java/fyresmodjam/handlers/FyresKeyHandler.java
+++ b/YWD/src/main/java/fyresmodjam/handlers/FyresKeyHandler.java
@@ -21,7 +21,6 @@ import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.MovingObjectPosition.MovingObjectType;
public class FyresKeyHandler {
-
public static KeyBinding examine = new KeyBinding("Examine", Keyboard.KEY_X, "YWD");
public static KeyBinding activateBlessing = new KeyBinding("Activate Blessing", Keyboard.KEY_K, "YWD");
diff --git a/YWD/src/main/resources/assets/fyresmodjam/lang/en_US.lang b/YWD/src/main/resources/assets/fyresmodjam/lang/en_US.lang
index 50f8423..a8631dc 100755
--- a/YWD/src/main/resources/assets/fyresmodjam/lang/en_US.lang
+++ b/YWD/src/main/resources/assets/fyresmodjam/lang/en_US.lang
@@ -16,5 +16,4 @@ commands.craftingKnowledge.usage=/craftingKnowledge [page] - used to check your
fyresmodjam.newVersion=\u00A7bA newer version of the "You Will Die" Mod has been found
death.attack.inferno=%s had their fire doused
-death.attack.retaliation=%s was killed for their crimes
-death.attack.ywdtrap=%s fell afoul of a trap \ No newline at end of file
+death.attack.retaliation=%s was killed for their crimes \ No newline at end of file