Support for Cauldron Close #151

Mine-and-blade-admin · Jul 20, 2015 · df7fbea · df7fbea
1 parent cd097aa
commit df7fbea
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 4 deletions.
diff --git a/battlegear api/1.7.10-Battlegear-Bin-1.0.8.1.jar b/battlegear api/1.7.10-Battlegear-Bin-1.0.8.1.jar
diff --git a/battlegear api/1.7.10-Battlegear-Src-1.0.8.1.jar b/battlegear api/1.7.10-Battlegear-Src-1.0.8.1.jar
diff --git a/battlegear api/1.7.10-MUD-Bin-1.0.8.1.jar b/battlegear api/1.7.10-MUD-Bin-1.0.8.1.jar
diff --git a/battlegear api/1.7.10-MUD-Src-1.0.8.1.jar b/battlegear api/1.7.10-MUD-Src-1.0.8.1.jar
diff --git a/battlegear dist/1.7.10-MB_Battlegear2-Bullseye-1.0.8.1.jar b/battlegear dist/1.7.10-MB_Battlegear2-Bullseye-1.0.8.1.jar
diff --git a/battlegear dist/1.7.10-MB_Battlegear2-Bullseye-1.0.8.1.jar.MD5 b/battlegear dist/1.7.10-MB_Battlegear2-Bullseye-1.0.8.1.jar.MD5
@@ -0,0 +1 @@
+4e42b6d167ccd211a0f83d71148889a9
diff --git a/... mod src/minecraft/mods/battlegear2/coremod/transformers/NetServerHandlerTransformer.java b/... mod src/minecraft/mods/battlegear2/coremod/transformers/NetServerHandlerTransformer.java
@@ -97,9 +97,9 @@ private boolean processPlaceMethod(MethodNode mn) {
                     newList.add(new MethodInsnNode(INVOKESTATIC,
                             UTILITY_CLASS,
                             "setPlayerCurrentItem", "(L" + entityPlayerClassName + ";L" + itemStackClassName + ";)V"));
-
-                    // MCPC and Minecraft Forkage already add fixes for this
-                    if (!FMLCommonHandler.instance().getModName().contains("mcpc") && !Launch.blackboard.containsKey("IsForkage")) {
+                    String fml = FMLCommonHandler.instance().getModName();
+                    // MCPC and Minecraft Forkage already add fixes for this, (but not Cauldron ?)
+                    if (fml.contains("cauldron") || (!fml.contains("mcpc") && !Launch.blackboard.containsKey("IsForkage"))) {
                         int slotIndex = 0;
                         while (it.hasNext()) {
                             nextNode = it.next();

diff --git a/mod.properties b/mod.properties
@@ -1,6 +1,6 @@
 modid=battlegear2
 modname=Mine & Blade Battlegear 2 - Bullseye
-modversion=1.0.8.0
+modversion=1.0.8.1
 mcversion=1.7.10
 loadingPlugin=mods.battlegear2.coremod.BattlegearLoadingPlugin
 containsMod=true