From 0a52c7f3346833fd568e020d3f1b918b792b09f4 Mon Sep 17 00:00:00 2001 From: EvilSeph Date: Tue, 20 Sep 2011 16:31:43 -0400 Subject: [PATCH] Made health regeneration only occur if difficulty is set to 0 (Peaceful). --- src/main/java/net/minecraft/server/EntityHuman.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java index dd6f612f8..eafc83b21 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -291,8 +291,8 @@ public abstract class EntityHuman extends EntityLiving { --this.n; } - // CraftBukkit - spawnMonsters -> allowMonsters - if (!this.world.allowMonsters && this.health < 20 && this.ticksLived % 20 * 12 == 0) { + if (this.world.spawnMonsters == 0 && this.health < 20 && this.ticksLived % 20 * 12 == 0) { + // CraftBukkit - added regain reason of "REGEN" for filtering purposes. this.c(1, RegainReason.REGEN); }