diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-03-19 21:29:12 +0000 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-03-19 21:29:33 +0000 |
| commit | 350cb9927ec1feb83d20a5059f3c5199f27f071f (patch) | |
| tree | 2a943b8b106371a55ecf1f47bb6b65a5b4289824 /src/main | |
| parent | 234e60735ca6f4ecb7e56996c95ea31b5bb97cc0 (diff) | |
| download | craftbukkit-350cb9927ec1feb83d20a5059f3c5199f27f071f.tar craftbukkit-350cb9927ec1feb83d20a5059f3c5199f27f071f.tar.gz craftbukkit-350cb9927ec1feb83d20a5059f3c5199f27f071f.tar.lz craftbukkit-350cb9927ec1feb83d20a5059f3c5199f27f071f.tar.xz craftbukkit-350cb9927ec1feb83d20a5059f3c5199f27f071f.zip | |
Update the rename markers
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftGuardian.java | 16 | ||||
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java | 2 |
2 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 e015a39e..9f095488 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(); + return ((EntityGuardian)entity).cn(); // PAIL: Rename isElder } @Override @@ -32,22 +32,22 @@ public class CraftGuardian extends CraftMonster implements Guardian { EntityGuardian entityGuardian = (EntityGuardian) entity; if (!isElder() && shouldBeElder) { - entityGuardian.a( true ); + entityGuardian.a( true ); // PAIL: Rename setElder } else if (isElder() && !shouldBeElder) { - entityGuardian.a( false ); + entityGuardian.a( false ); // PAIL: Rename setElder // 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 - // PAIL: rename and check these on update - entityGuardian.getAttributeInstance(GenericAttributes.e).setValue(6.0D); - entityGuardian.getAttributeInstance(GenericAttributes.d).setValue(0.5D); - entityGuardian.getAttributeInstance(GenericAttributes.b).setValue(16.0D); + // 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.maxHealth).setValue(30.0D); // Update pathfinding (random stroll back to 80) - entityGuardian.br.b(80); + entityGuardian.br.b(80); // PAIL: Rename goalRandomStroll.setTimeBetweenMovement // 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 05923b44..16a35b85 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()); // RENAME + getHandle().e((Entity) getHandle()); // PAIL: Rename setSpectatorTarget getHandle().playerInteractManager.setGameMode(WorldSettings.EnumGamemode.getById(mode.getValue())); getHandle().fallDistance = 0; getHandle().playerConnection.sendPacket(new PacketPlayOutGameStateChange(3, mode.getValue())); |