Fix crash on startup because AppleCore broke its own rules

Player was null in GetMaxHunger hooks in injected FoodStats constructor cause I'm a dumb Closes #125, closes #126
squeek502 · Jun 12, 2018 · 0647c9f · 0647c9f
1 parent bc0022c
commit 0647c9f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/java/squeek/applecore/asm/module/ModuleFoodStats.java b/java/squeek/applecore/asm/module/ModuleFoodStats.java
@@ -157,14 +157,14 @@ public void injectFoodStatsConstructor(ClassNode classNode)
 		MethodNode constructor = new MethodNode(ACC_PUBLIC, "<init>", ASMHelper.toMethodDescriptor("V", ASMConstants.PLAYER), null, null);
 		constructor.instructions = ASMHelper.cloneInsnList(defaultConstructor.instructions);
 
-		AbstractInsnNode targetNode = ASMHelper.findLastInstructionWithOpcode(constructor, RETURN);
+		AbstractInsnNode targetNode = ASMHelper.findFirstInstructionWithOpcode(constructor, INVOKESPECIAL);
 
 		InsnList toInject = new InsnList();
 		toInject.add(new VarInsnNode(ALOAD, 0)); // this
 		toInject.add(new VarInsnNode(ALOAD, 1)); // player param
 		toInject.add(new FieldInsnNode(PUTFIELD, classNode.name, foodStatsPlayerField, ASMHelper.toDescriptor(ASMConstants.PLAYER)));
 
-		constructor.instructions.insertBefore(targetNode, toInject);
+		constructor.instructions.insert(targetNode, toInject);
 
 		classNode.methods.add(constructor);
 	}