Merge 1.9.4

haoling · May 12, 2017 · 98af813 · 98af813
2 parents e0c47b1 + 73ab66c
commit 98af813
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,5 @@
 /run/
 /LittleMaidReengaged.1.9_Client.launch
 /LittleMaidReengaged.1.9_Server.launch
+/LittleMaidReengaged.1.9.4_Client.launch
+/LittleMaidReengaged.1.9.4_Server.launch
diff --git a/src/main/java/net/blacklab/lmr/entity/EntityLittleMaid.java b/src/main/java/net/blacklab/lmr/entity/EntityLittleMaid.java
@@ -385,7 +385,7 @@ public EntityLittleMaid(World par1World) {
 		setHealth(15F);
 
 		// 移動用フィジカル設定
-		((PathNavigateGround)navigator).setEnterDoors(true);
+		((PathNavigateGround)navigator).setBreakDoors(true);
 
 		// TODO:これはテスト
 //		maidStabilizer.put("HeadTop", MMM_StabilizerManager.getStabilizer("WitchHat", "HeadTop"));

diff --git a/src/main/java/net/blacklab/lmr/entity/mode/EntityMode_Farmer.java b/src/main/java/net/blacklab/lmr/entity/mode/EntityMode_Farmer.java
@@ -298,7 +298,7 @@ protected boolean isBlockWatered(int x, int y, int z){
 
 			mutableblockpos = (BlockPos.MutableBlockPos)iterator.next();
 		}
-		while ((iState = owner.worldObj.getBlockState(mutableblockpos)).getBlock().getMaterial(iState) != Material.WATER);
+		while ((iState = owner.worldObj.getBlockState(mutableblockpos)).getMaterial() != Material.WATER);
 
 		return true;
 	}

diff --git a/src/main/resources/LICENSE.md b/src/main/resources/LICENSE.md
diff --git a/src/main/resources/LICENSE.md b/src/main/resources/LICENSE.md
@@ -0,0 +1 @@
+../../../LICENSE.md
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
@@ -3,7 +3,7 @@
 	"modid": "lmreengaged",
 	"name": "LittleMaidReengaged",
 	"description": "Improved minecraft life with cute & little maids",
-	"version": "8.0.1.66",
+	"version": "8.0.2.68",
 	"url": "http://el-blacklab.net/",
 	"authorList": ["MMM, EMB4, Verclene"],
 	"credits": "Created by MMM, remixed by EMB4 & Verclene",