Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-24 19:46:21 +01:00
Code Issues Projects Releases Wiki Activity

Added per world PVP setting support.

Browse Source
This commit is contained in:
Rigby 2011-04-29 23:34:37 +01:00 committed by EvilSeph
parent 5a5ce79035
commit f342db744a
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minecraft/server/EntityPlayer.java
View File

@ -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;
}

1
src/main/java/net/minecraft/server/World.java
View File

@ -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;

1
src/main/java/net/minecraft/server/WorldServer.java
View File

@ -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;

8
src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View File

@ -612,4 +612,12 @@ public class CraftWorld implements World {
public long getSeed() {
return world.worldData.b();
}
public boolean getPVP() {
return world.pvpMode;
}
public void setPVP(boolean pvp) {
world.pvpMode = pvp;
}
}