$ Fixed LFTR tooltip not mentioning which casings to use.

% More messing around with entity rendering and some custom mobs.

2 files changed, 7 insertions, 10 deletions

diff --git a/src/Java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java b/src/Java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java
index 4d46c0a5ca..0c650ed3f2 100644
--- a/src/Java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java
+++ b/src/Java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java
@@ -19,6 +19,7 @@ public class EntitySickBlaze extends EntityBlaze {
 	/** ticks until heightOffset is randomized */
 	private int heightOffsetUpdateTime;
 	private int field_70846_g;
+	private final int mDataWatcherID = 30;
 
 	public EntitySickBlaze(World p_i1731_1_) {
 		super(p_i1731_1_);
@@ -35,7 +36,7 @@ public class EntitySickBlaze extends EntityBlaze {
 	@Override
 	protected void entityInit() {
 		super.entityInit();
-		this.dataWatcher.addObject(16, new Byte((byte) 0));
+		this.dataWatcher.addObject(mDataWatcherID, new Byte((byte) 0));
 	}
 
 	/**
@@ -209,12 +210,12 @@ public class EntitySickBlaze extends EntityBlaze {
 
 	@Override
 	public boolean func_70845_n() {
-		return (this.dataWatcher.getWatchableObjectByte(16) & 1) != 0;
+		return (this.dataWatcher.getWatchableObjectByte(mDataWatcherID) & 1) != 0;
 	}
 
 	@Override
 	public void func_70844_e(boolean p_70844_1_) {
-		byte b0 = this.dataWatcher.getWatchableObjectByte(16);
+		byte b0 = this.dataWatcher.getWatchableObjectByte(mDataWatcherID);
 
 		if (p_70844_1_) {
 			b0 = (byte) (b0 | 1);
@@ -223,7 +224,7 @@ public class EntitySickBlaze extends EntityBlaze {
 			b0 &= -2;
 		}
 
-		this.dataWatcher.updateObject(16, Byte.valueOf(b0));
+		this.dataWatcher.updateObject(mDataWatcherID, Byte.valueOf(b0));
 	}
 
 	/**
diff --git a/src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyWarrior.java b/src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java
index b6829f6985..0006cae8af 100644
--- a/src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyWarrior.java
+++ b/src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java
@@ -17,14 +17,14 @@ import net.minecraft.util.*;
 import net.minecraft.village.Village;
 import net.minecraft.world.World;
 
-public class EntityStaballoyWarrior extends EntityGolem {
+public class EntityStaballoyConstruct extends EntityGolem {
 	/** deincrements, and a distance-to-home check is done at 0 */
 	private int homeCheckTimer;
 	Village villageObj;
 	private int attackTimer;
 	private int holdRoseTick;
 
-	public EntityStaballoyWarrior(World world) {
+	public EntityStaballoyConstruct(World world) {
 		super(world);
 		this.setSize(1.4F, 2.9F);
 		this.getNavigator().setAvoidsWater(true);
@@ -274,10 +274,6 @@ public class EntityStaballoyWarrior extends EntityGolem {
 	 */
 	@Override
 	public void onDeath(DamageSource p_70645_1_) {
-		if (!this.isPlayerCreated() && this.attackingPlayer != null && this.villageObj != null) {
-			this.villageObj.setReputationForPlayer(this.attackingPlayer.getCommandSenderName(), -5);
-		}
-
 		super.onDeath(p_70645_1_);
 	}
 }
\ No newline at end of file