4.4.109(NX4 Build 109)

Verclene · Dec 29, 2015 · e67346d · e67346d
2 parents 0782dde + b8ccb3d
commit e67346d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 16 deletions.
diff --git a/src/main/java/littleMaidMobX/LMM_EntityLittleMaid.java b/src/main/java/littleMaidMobX/LMM_EntityLittleMaid.java
@@ -931,16 +931,16 @@ public void playLivingSound() {
 		// 普段の声
 		//LMM_LittleMaidMobNX.Debug("DEBUG INFO=tick %d", livingSoundTick);
 		//livingSoundTick--;
-		if(getAttackTarget()!=null || Math.random() > 0.2) return;
-		LMM_EnumSound so = LMM_EnumSound.living_daytime;
+		if(getAttackTarget()!=null || Math.random() > 0.3) return;
+		LMM_EnumSound so = LMM_EnumSound.Null;
 		if (getHealth() < 10)
 			so = LMM_EnumSound.living_whine;
-		else if (rand.nextFloat() < maidSoundRate) {
+		else /*if (rand.nextFloat() < maidSoundRate) */{
 			if (mstatTime > 23500 || mstatTime < 1500) {
 				so = LMM_EnumSound.living_morning;
 			} else if (mstatTime < 12500) {
 				if (isContract()) {
-					BiomeGenBase biomegenbase = worldObj.getBiomeGenForCoords(new BlockPos(MathHelper.floor_double(posX + 0.5D), posY, MathHelper.floor_double(posZ + 0.5D)));
+					BiomeGenBase biomegenbase = worldObj.getBiomeGenForCoords(getPosition());
 					TempCategory ltemp = biomegenbase.getTempCategory();
 					if (ltemp == TempCategory.COLD) {
 						so = LMM_EnumSound.living_cold;
@@ -950,10 +950,10 @@ else if (rand.nextFloat() < maidSoundRate) {
 						so = LMM_EnumSound.living_daytime;
 					}
 					if (worldObj.isRaining()) {
-						if (biomegenbase.canSpawnLightningBolt()) {
-							so = LMM_EnumSound.living_rain;
-						} else if (biomegenbase.getEnableSnow()) {
+						if (biomegenbase.getEnableSnow()) {
 							so = LMM_EnumSound.living_snow;
+						} else {
+							so = LMM_EnumSound.living_rain;
 						}
 					}
 				} else {

diff --git a/src/main/java/littleMaidMobX/LMM_EventHook.java b/src/main/java/littleMaidMobX/LMM_EventHook.java
@@ -81,7 +81,7 @@ public void onPlayerLogin(PlayerEvent.PlayerLoggedInEvent event){
 	@SubscribeEvent
 	public void onEntitySpawned(EntityJoinWorldEvent event){
 		if(event.entity instanceof EntityLivingBase){
-//			event.setCanceled(LMM_EventHook.deleteDoppelganger(true, event.world, event.entity));
+			event.setCanceled(deleteDoppelganger(true, event.world, event.entity));
 		}
 
 		// TODO issue #9 merge from LittleMaidMobAX(https://github.com/asiekierka/littleMaidMobX/commit/92b2850b1bc4a70b69629cfc84c92748174c8bc6)
@@ -138,13 +138,12 @@ public static boolean deleteDoppelganger(boolean loading, World worldObj, Entity
 
 						boolean c1 = elm.getClass().getName().equals(entity.getClass().getName());
 
-						boolean c2 = elm.getUniqueID().toString().equals(entity.getUniqueID().toString());
+						boolean c2 = elm.getUniqueID().equals(entity.getUniqueID());
 
 						if (c1 && c2) {
-							// 新しい方を残す
 							LMM_LittleMaidMobNX.Debug("REMOVE DOPPELGANGER UUID %s", entity.getUniqueID());
-							if (entity.getEntityId() > elm.getEntityId()) {
-								elm.setDead();
+							if (entity.getEntityId() < elm.getEntityId()) {
+								entity.setDead();
 							} else {
 								return true;
 							}

diff --git a/src/main/java/littleMaidMobX/LMM_LittleMaidMobNX.java b/src/main/java/littleMaidMobX/LMM_LittleMaidMobNX.java
@@ -45,10 +45,10 @@
 public class LMM_LittleMaidMobNX {
 
 	public static final String DOMAIN = "lmmx";
-	public static final String VERSION = "4.3.107";
-	public static final String VERSION_FORSITE = "NX4 Build 107";
+	public static final String VERSION = "4.4.109";
+	public static final String VERSION_FORSITE = "NX4 Build 109";
 	public static final String ACCEPTED_MCVERSION = "[1.8,1.8.8]";
-	public static final int VERSION_CODE = 11;
+	public static final int VERSION_CODE = 12;
 
 	/*
 	 * public static String[] cfg_comment = {

diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
@@ -3,7 +3,7 @@
 	"modid": "lmmx",
 	"name": "LittleMaidMobNX",
 	"description": "Improved minecraft life with cute & little maids",
-	"version": "NX4 Build 107",
+	"version": "NX4 Build 109",
 	"mcversion": "1.8.x",
 	"url": "http://el-blacklab.net/",
 	"authorList": ["Verclene"],