Added per world PVP setting support.

2011-04-29 23:34:37 +01:00
parent 5a5ce79035
commit f342db744a
4 changed files with 11 additions and 1 deletions
--- 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;
                }