Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2024-11-25 20:16:06 +01:00
Code Issues Projects Releases Wiki Activity

Fix fakePVP

Browse Source
This commit is contained in:
Eric Stokes 2011-07-09 22:15:36 -06:00
parent 54573889af
commit b6d718a0ba
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/onarandombox/MultiverseCore/MVWorld.java
View File

@ -78,13 +78,6 @@ public class MVWorld {
private List<Integer> blockBlacklist; // Contain a list of Blocks which we won't allow on this World. 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 HashMap<String, List<String>> masterList;
private Double scaling; // How stretched/compressed distances are private Double scaling; // How stretched/compressed distances are
@ -274,6 +267,7 @@ public class MVWorld {
} }
private void syncMobs() { private void syncMobs() {
if (this.getAnimalList().isEmpty()) { if (this.getAnimalList().isEmpty()) {
this.world.setSpawnFlags(this.world.getAllowMonsters(), this.allowAnimals); this.world.setSpawnFlags(this.world.getAllowMonsters(), this.allowAnimals);
} else { } else {
@ -427,7 +421,12 @@ public class MVWorld {
} }
public void setPvp(Boolean pvp) { 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.pvp = pvp;
this.config.setProperty("worlds." + this.name + ".pvp", pvp); this.config.setProperty("worlds." + this.name + ".pvp", pvp);
this.config.save(); this.config.save();