summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorEvilSeph <evilseph@unaligned.org>2011-06-22 12:49:34 -0400
committerEvilSeph <evilseph@unaligned.org>2011-06-22 12:52:02 -0400
commitff67eda4c4d1018dd956010918645cecd35c2854 (patch)
tree138f19ba5919f0910462efbcef2b40e4c5bb9391 /src/main
parent7efaa1a02ee109de907d07e9ed21dd603258e951 (diff)
downloadcraftbukkit-ff67eda4c4d1018dd956010918645cecd35c2854.tar
craftbukkit-ff67eda4c4d1018dd956010918645cecd35c2854.tar.gz
craftbukkit-ff67eda4c4d1018dd956010918645cecd35c2854.tar.lz
craftbukkit-ff67eda4c4d1018dd956010918645cecd35c2854.tar.xz
craftbukkit-ff67eda4c4d1018dd956010918645cecd35c2854.zip
Fixed players not healing in other worlds when spawn-monsters is false.
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/net/minecraft/server/EntityHuman.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 88dbc4e7..3f20e67f 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -176,7 +176,8 @@ public abstract class EntityHuman extends EntityLiving {
}
public void u() {
- if (this.world.spawnMonsters == 0 && this.health < 20 && this.ticksLived % 20 * 12 == 0) {
+ // CraftBukkit - spawnMonsters -> allowMonsters
+ if (!this.world.allowMonsters && this.health < 20 && this.ticksLived % 20 * 12 == 0) {
this.b(1);
}