Fix NullPointerException on getMaidMasterEntity(). Closes #25.

Verclene · Dec 27, 2015 · aa00fd4 · aa00fd4
1 parent caaffd7
commit aa00fd4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/main/java/littleMaidMobX/LMM_EntityLittleMaid.java b/src/main/java/littleMaidMobX/LMM_EntityLittleMaid.java
@@ -1703,7 +1703,9 @@ protected void damageEntity(DamageSource par1DamageSource, float par2) {
 		if (par1DamageSource == DamageSource.fall) {
 			maidDamegeSound = LMM_EnumSound.hurt_fall;
 			if (isContractEX() && par2>=19 && par2<getHealth()) {
-				getMaidMasterEntity().triggerAchievement(LMMNX_Achievements.ac_Ashikubi);
+				EntityPlayer player;
+				if ((player = getMaidMasterEntity()) != null)
+					player.triggerAchievement(LMMNX_Achievements.ac_Ashikubi);
 			}
 		}
 		if(!par1DamageSource.isUnblockable() && isBlocking()) {
@@ -3401,6 +3403,7 @@ public boolean updateMaidContract() {
 	public EntityLivingBase getOwner() {
 		return getMaidMasterEntity();
 	}
+
 	public String getMaidMaster() {
 		return W_Common.getOwnerName(this);
 	}
@@ -3654,7 +3657,9 @@ protected void eatSugar(boolean heal, boolean motion, boolean recontract) {
 			}
 
 			if (worldObj.getTotalWorldTime() - maidAnniversary > 24000 * 365) {
-				getMaidMasterEntity().triggerAchievement(LMMNX_Achievements.ac_MyFavorite);
+				EntityPlayer player;
+				if ((player = getMaidMasterEntity()) != null)
+					player.triggerAchievement(LMMNX_Achievements.ac_MyFavorite);
 			}
 		}
 

diff --git a/src/main/java/littleMaidMobX/LMM_EntityMode_Cooking.java b/src/main/java/littleMaidMobX/LMM_EntityMode_Cooking.java
@@ -1,5 +1,6 @@
 package littleMaidMobX;
 
+import net.blacklab.lmmnx.achievements.LMMNX_Achievements;
 import net.minecraft.entity.ai.EntityAITasks;
 import net.minecraft.entity.item.EntityXPOrb;
 import net.minecraft.entity.player.EntityPlayer;
@@ -49,6 +50,9 @@ public boolean changeMode(EntityPlayer pentityplayer) {
 		if (litemstack != null) {
 			if (owner.maidInventory.isItemBurned(0)) {
 				owner.setMaidMode("Cooking");
+				if (LMMNX_Achievements.ac_Cook != null) {
+					pentityplayer.triggerAchievement(LMMNX_Achievements.ac_Cook);
+				}
 				return true;
 			}
 		}

diff --git a/src/main/java/littleMaidMobX/LMM_LittleMaidMobNX.java b/src/main/java/littleMaidMobX/LMM_LittleMaidMobNX.java
@@ -41,8 +41,8 @@
 public class LMM_LittleMaidMobNX {
 
 	public static final String DOMAIN = "lmmx";
-	public static final String VERSION = "4.3.97";
-	public static final String VERSION_FORSITE = "NX4 Build 97";
+	public static final String VERSION = "4.3.99";
+	public static final String VERSION_FORSITE = "NX4 Build 99";
 	public static final int VERSION_CODE = 11;
 
 	/*