Re-added per-world PVP setting support which was accidentally lost in translation. Thanks Rigby!

This commit is contained in:
EvilSeph 2011-06-07 01:43:12 -04:00
parent 9fde27bfcd
commit 57a1a7422c

View file

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