diff options
Diffstat (limited to 'src')
3 files changed, 9 insertions, 9 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftGuardian.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftGuardian.java index 9f095488..3a0ce677 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftGuardian.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftGuardian.java @@ -24,7 +24,7 @@ public class CraftGuardian extends CraftMonster implements Guardian { @Override public boolean isElder() { - return ((EntityGuardian)entity).cn(); // PAIL: Rename isElder + return ((EntityGuardian)entity).isElder(); } @Override @@ -32,22 +32,22 @@ public class CraftGuardian extends CraftMonster implements Guardian { EntityGuardian entityGuardian = (EntityGuardian) entity; if (!isElder() && shouldBeElder) { - entityGuardian.a( true ); // PAIL: Rename setElder + entityGuardian.setElder(true); } else if (isElder() && !shouldBeElder) { - entityGuardian.a( false ); // PAIL: Rename setElder + entityGuardian.setElder(false); // Since minecraft does not reset the elder Guardian to a guardian we have to do that entity.setSize(0.85F, 0.85F); // Since aW() calls its supers it will try to re register attributes which is invalid // check these on update - entityGuardian.getAttributeInstance(GenericAttributes.e).setValue(6.0D); // PAIL: Rename ATTACK_DAMAGE - entityGuardian.getAttributeInstance(GenericAttributes.d).setValue(0.5D); // PAIL: Rename MOVEMENT_SPEED - entityGuardian.getAttributeInstance(GenericAttributes.b).setValue(16.0D); // PAIL: Rename FOLLOW_RANGE + entityGuardian.getAttributeInstance(GenericAttributes.ATTACK_DAMAGE).setValue(6.0D); + entityGuardian.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).setValue(0.5D); + entityGuardian.getAttributeInstance(GenericAttributes.FOLLOW_RANGE).setValue(16.0D); entityGuardian.getAttributeInstance(GenericAttributes.maxHealth).setValue(30.0D); // Update pathfinding (random stroll back to 80) - entityGuardian.br.b(80); // PAIL: Rename goalRandomStroll.setTimeBetweenMovement + entityGuardian.goalRandomStroll.setTimeBetweenMovement(80); // Tell minecraft that we need persistence since the guardian changed entityGuardian.initAttributes(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index 16a35b85..e229dc07 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -759,7 +759,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return; } - getHandle().e((Entity) getHandle()); // PAIL: Rename setSpectatorTarget + getHandle().setSpectatorTarget(getHandle()); getHandle().playerInteractManager.setGameMode(WorldSettings.EnumGamemode.getById(mode.getValue())); getHandle().fallDistance = 0; getHandle().playerConnection.sendPacket(new PacketPlayOutGameStateChange(3, mode.getValue())); diff --git a/src/test/java/org/bukkit/PerMaterialTest.java b/src/test/java/org/bukkit/PerMaterialTest.java index e36a3e75..2cbf4ecb 100644 --- a/src/test/java/org/bukkit/PerMaterialTest.java +++ b/src/test/java/org/bukkit/PerMaterialTest.java @@ -34,7 +34,7 @@ public class PerMaterialTest extends AbstractTestingBase { @BeforeClass public static void getFireValues() { - fireValues = Util.getInternalState(BlockFire.class, Blocks.FIRE, "T"); // PAIL: Rename flameChances + fireValues = Util.getInternalState(BlockFire.class, Blocks.FIRE, "flameChances"); } @Parameters(name= "{index}: {0}") |