From 57a1a7422cc8a0018310cfcd4ac42c920d465a9b Mon Sep 17 00:00:00 2001
From: EvilSeph <evilseph@unaligned.org>
Date: Tue, 7 Jun 2011 01:43:12 -0400
Subject: Re-added per-world PVP setting support which was accidentally lost in
 translation. Thanks Rigby!

---
 src/main/java/net/minecraft/server/EntityPlayer.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/main')

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;
                 }
-- 
cgit v1.2.3