summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/main/java/net/minecraft/server/EntityPlayer.java3
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;
}