5.2.84: Stable (NX5 Build 84)

Verclene · Mar 6, 2016 · f6cef63 · f6cef63
2 parents b9d6925 + 8867874
commit f6cef63
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/src/main/java/littleMaidMobX/LMM_EntityMode_Torcher.java b/src/main/java/littleMaidMobX/LMM_EntityMode_Torcher.java
@@ -9,6 +9,7 @@
 import net.minecraft.entity.ai.EntityAITasks;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
@@ -137,8 +138,9 @@ protected int getBlockLighting(int px, int py, int pz) {
 			}
 		}
 
+		BlockPos targetPos = new BlockPos(px, py, pz);
 		if (!owner.isMaidWait()) {
-			int a = worldObj.getLight(new BlockPos(px,py,pz),true);
+			int a = worldObj.getLight(targetPos,true);
 			return a;
 		}
 		return 15;
@@ -153,6 +155,13 @@ public boolean checkBlock(int pMode, int px, int py, int pz) {
 				owner.getMaidMasterEntity().getDistanceSq(px, py, pz) > LMM_EntityModeBase.limitDistance_Follow) {
 			return false;
 		}
+		// アイテムを置けない場合
+		Item heldItem = owner.getHeldItem().getItem();
+		if (heldItem instanceof ItemBlock) {
+			if (!canPlaceItemBlockOnSide(owner.worldObj, px, py - 1, pz, EnumFacing.UP, owner.maidAvatar, owner.getHeldItem(), (ItemBlock) heldItem)) {
+				return false;
+			}
+		}
 
 		int v = getBlockLighting(px, py, pz);
 		if (v < 8 && VectorUtil.canBlockBeSeen(owner, px, py - 1, pz, true, true, true) && !owner.isMaidWait()) {

diff --git a/src/main/java/littleMaidMobX/LMM_LittleMaidMobNX.java b/src/main/java/littleMaidMobX/LMM_LittleMaidMobNX.java
@@ -47,10 +47,10 @@
 public class LMM_LittleMaidMobNX {
 
 	public static final String DOMAIN = "lmmx";
-	public static final String VERSION = "5.1.83";
-	public static final String VERSION_FORSITE = "NX5 Build 83";
+	public static final String VERSION = "5.2.84";
+	public static final String VERSION_FORSITE = "NX5 Build 84";
 	public static final String ACCEPTED_MCVERSION = "[1.8,1.8.9]";
-	public static final int VERSION_CODE = 14;
+	public static final int VERSION_CODE = 15;
 
 	public static final VersionData currentVersion = new VersionData(VERSION_CODE, VERSION, VERSION_FORSITE);
 	public static VersionData latestVersion = new VersionData(1, "1.0.1", "NX1");

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": "NX5 Build 83",
+	"version": "NX5 Build 84",
 	"mcversion": "1.8.x",
 	"url": "http://el-blacklab.net/",
 	"authorList": ["Verclene"],