diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2020-01-10 17:35:54 +0000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2020-01-10 17:35:54 +0000 |
| commit | 9232871f5a734a52ecdc7bc24e35b009bf9c5b66 (patch) | |
| tree | fb83ae6ddea3eaca901ffa149c3f39121bcd2be1 | |
| parent | a6753414a126d48a4615288d1f0e907ad524c54d (diff) | |
| download | GT5-Unofficial-9232871f5a734a52ecdc7bc24e35b009bf9c5b66.tar.gz GT5-Unofficial-9232871f5a734a52ecdc7bc24e35b009bf9c5b66.tar.bz2 GT5-Unofficial-9232871f5a734a52ecdc7bc24e35b009bf9c5b66.zip | |
- Disabled Entity Fix by default.
| -rw-r--r-- | src/Java/gtPlusPlus/preloader/asm/AsmConfig.java | 4 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/Java/gtPlusPlus/preloader/asm/AsmConfig.java b/src/Java/gtPlusPlus/preloader/asm/AsmConfig.java index 06b1cb8013..fc7d408cb9 100644 --- a/src/Java/gtPlusPlus/preloader/asm/AsmConfig.java +++ b/src/Java/gtPlusPlus/preloader/asm/AsmConfig.java @@ -52,10 +52,10 @@ public class AsmConfig { disableAllLogging = prop.getBoolean(false); propOrderDebug.add(prop.getName()); - prop = config.get("debug", "enabledFixEntitySetHealth", true); + prop = config.get("debug", "enabledFixEntitySetHealth", false); prop.comment = "Enable/Disable entity setHealth() fix."; prop.setLanguageKey("gtpp.enabledFixEntitySetHealth").setRequiresMcRestart(true); - enabledFixEntitySetHealth = prop.getBoolean(true); + enabledFixEntitySetHealth = prop.getBoolean(false); propOrderDebug.add(prop.getName()); prop = config.get("debug", "enableChunkDebugging", false); diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java index d1ddcc4a9e..7e2914ea30 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java +++ b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java @@ -65,7 +65,13 @@ public class Preloader_Transformer_Handler implements IClassTransformer { * Only EntityLivingBase is left untouched, as nothing else truly needs to be calling this method and avoiding forge hooks. * May exclude all vanilla/forge class if this causes issues though. */ - if (mConfig.enabledFixEntitySetHealth) { + PatchForge : if (mConfig.enabledFixEntitySetHealth && !transformedName.contains("gtPlusPlus.preloader")) { + + //Skip Vanilla/Forge Classes + if (transformedName.contains("net.minecraft.") || transformedName.contains("cpw.")) { + //break PatchForge; + } + ClassTransformer_Forge_EntityLivingBase_SetHealth aForgeHealthFix = new ClassTransformer_Forge_EntityLivingBase_SetHealth(transformedName, basicClass); if (aForgeHealthFix.isValidTransformer() && aForgeHealthFix.didPatchClass()) { FMLRelaunchLog.log("[GT++ ASM] Fix EntityLivingBase.setHealth misuse", Level.INFO, "Transforming %s", transformedName); |