3 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index eb8d9d32..e04fa6e1 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -132,7 +132,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
         if (this.bG > 0) {
             return false;
         } else {
-            if (!this.b.pvpMode) {
+            if (!this.world.pvpMode) { // CraftBukkit this.b.pvpMode -> this.world.pvpMode 
                 if (entity instanceof EntityHuman) {
                     return false;
                 }
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index ed7a5636..7a2c67fa 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -57,6 +57,7 @@ public class World implements IBlockAccess {
     private int J = 0;
     public boolean allowMonsters = true; // CraftBukkit private->public
     public boolean allowAnimals = true; // CraftBukkit private->public
+    public boolean pvpMode; // CraftBukkit
     static int u = 0;
     private Set M = new HashSet();
     private int N;
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index e0c73c28..852c89d7 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -26,6 +26,7 @@ public class WorldServer extends World implements BlockChangeDelegate {
         this.cserver = minecraftserver.server;
         this.world = new CraftWorld(this);
         this.manager = new PlayerManager(minecraftserver, this);
+        this.pvpMode = minecraftserver.pvpMode;
     }
 
     public PlayerManager manager;