From b6d718a0bac45ec427445c3f2c75f13c3885c136 Mon Sep 17 00:00:00 2001
From: Eric Stokes <fernferret@gmail.com>
Date: Sat, 9 Jul 2011 22:15:36 -0600
Subject: [PATCH] Fix fakePVP

---
 src/com/onarandombox/MultiverseCore/MVWorld.java | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/com/onarandombox/MultiverseCore/MVWorld.java b/src/com/onarandombox/MultiverseCore/MVWorld.java
index 1638135f..93a82cd1 100644
--- a/src/com/onarandombox/MultiverseCore/MVWorld.java
+++ b/src/com/onarandombox/MultiverseCore/MVWorld.java
@@ -78,13 +78,6 @@ public class MVWorld {
     
     private List<Integer> blockBlacklist; // Contain a list of Blocks which we won't allow on this World.
     
-    // These have been moved to a hash, for easy editing with strings.
-    // private List<String> playerWhitelist; // Contain a list of Players/Groups which can join this World.
-    // private List<String> playerBlacklist; // Contain a list of Players/Groups which cannot join this World.
-    // private List<String> editWhitelist; // Contain a list of Players/Groups which can edit this World. (Place/Destroy Blocks)
-    // private List<String> editBlacklist; // Contain a list of Players/Groups which cannot edit this World. (Place/Destroy Blocks)
-    // private List<String> worldBlacklist; // Contain a list of Worlds which Players cannot use to Portal to this World.
-    
     private HashMap<String, List<String>> masterList;
     
     private Double scaling; // How stretched/compressed distances are
@@ -274,6 +267,7 @@ public class MVWorld {
     }
     
     private void syncMobs() {
+        
         if (this.getAnimalList().isEmpty()) {
             this.world.setSpawnFlags(this.world.getAllowMonsters(), this.allowAnimals);
         } else {
@@ -427,7 +421,12 @@ public class MVWorld {
     }
     
     public void setPvp(Boolean pvp) {
-        this.world.setPVP(pvp);
+        boolean fakepvp = this.plugin.configMV.getBoolean("fakepvp", false);
+        if(fakepvp) {
+            this.world.setPVP(false);
+        } else {
+            this.world.setPVP(pvp);
+        }
         this.pvp = pvp;
         this.config.setProperty("worlds." + this.name + ".pvp", pvp);
         this.config.save();