Update CraftBukkit to Minecraft 1.7.2

2013-11-04 07:07:38 -06:00
parent ff8b70fbb7
commit 2726696652
349 changed files with 14339 additions and 11287 deletions
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftDamageSource.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftDamageSource.java
@@ -9,17 +9,17 @@ public final class CraftDamageSource extends DamageSource {

        // Check ignoresArmor
        if (original.ignoresArmor()) {
-            newSource.j();
+            newSource.k();
        }

        // Check magic
-        if (original.q()) {
-            newSource.r();
+        if (original.s()) {
+            newSource.t();
        }

        // Check fire
        if (original.c()) {
-            newSource.l();
+            newSource.n();
        }

        return newSource;