diff options
| author | EvilSeph <evilseph@unaligned.org> | 2011-06-07 01:43:12 -0400 |
|---|---|---|
| committer | EvilSeph <evilseph@unaligned.org> | 2011-06-07 01:43:12 -0400 |
| commit | 57a1a7422cc8a0018310cfcd4ac42c920d465a9b (patch) | |
| tree | 279606083988084e478bd14eeaa7f76c630dee86 /src/main | |
| parent | 9fde27bfcd7cfaa056d73459316aabde1fcb7ce7 (diff) | |
| download | craftbukkit-57a1a7422cc8a0018310cfcd4ac42c920d465a9b.tar craftbukkit-57a1a7422cc8a0018310cfcd4ac42c920d465a9b.tar.gz craftbukkit-57a1a7422cc8a0018310cfcd4ac42c920d465a9b.tar.lz craftbukkit-57a1a7422cc8a0018310cfcd4ac42c920d465a9b.tar.xz craftbukkit-57a1a7422cc8a0018310cfcd4ac42c920d465a9b.zip | |
Re-added per-world PVP setting support which was accidentally lost in translation. Thanks Rigby!
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityPlayer.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java index f55f7dd7..fd186a16 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -145,7 +145,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { if (this.bL > 0) { return false; } else { - if (!this.b.pvpMode) { + // CraftBukkit - this.b.pvpMode -> this.world.pvpMode + if (!this.world.pvpMode) { if (entity instanceof EntityHuman) { return false; } |