diff options
author | Nathan Adams <dinnerbone@dinnerbone.com> | 2012-03-22 20:39:39 +0000 |
---|---|---|
committer | Nathan Adams <dinnerbone@dinnerbone.com> | 2012-03-22 20:39:39 +0000 |
commit | 9d09e7d0167326d4169f734e4b6d04c54d767507 (patch) | |
tree | 898333912891b9c35a63994242fbd55d5b6ac2c6 /src/main/java/net/minecraft/server/EntityPlayer.java | |
parent | 8dc7417a3d5c1af1e6434dc54952cfd5a8e90688 (diff) | |
download | craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.tar craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.tar.gz craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.tar.lz craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.tar.xz craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.zip |
Updated to Minecraft version 1.2.4. Updated version string to 1.2.4-R0.1.
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityPlayer.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityPlayer.java | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java index 90a154ef..fe703847 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -135,7 +135,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { return 1.62F; } - public void G_() { + public void F_() { this.itemInWorldManager.c(); --this.invulnerableTicks; this.activeContainer.a(); @@ -216,7 +216,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } } - protected boolean C_() { + protected boolean C() { return this.server.pvpMode; } @@ -225,7 +225,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } public void a(boolean flag) { - super.G_(); + super.F_(); for (int i = 0; i < this.inventory.getSize(); ++i) { ItemStack itemstack = this.inventory.getItem(i); @@ -405,7 +405,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { this.activeContainer.a(); } - public void D() { + public void C_() { if (!this.t) { this.u = -1; this.t = true; @@ -621,7 +621,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } } - public void J() { + public void D_() { this.cf = -99999999; this.lastSentExp = -1; // CraftBukkit - Added to reset } @@ -678,6 +678,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting { entitytracker.sendPacketToEntity(this, new Packet18ArmAnimation(entity, 7)); } + public void updateAbilities() { + if (this.netServerHandler != null) { + this.netServerHandler.sendPacket(new Packet202Abilities(this.abilities)); + } + } + // CraftBukkit start public long timeOffset = 0; public boolean relativeTime = true; |