Fix reach calculation when player has higher/lower eye height than no…

…rmal
Meldexun · Jan 28, 2022 · c646690 · c646690
1 parent 760c4d4
commit c646690
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/main/java/meldexun/reachfix/asm/ReachFixClassTransformer.java b/src/main/java/meldexun/reachfix/asm/ReachFixClassTransformer.java
@@ -5,6 +5,7 @@
 import org.objectweb.asm.tree.InsnNode;
 import org.objectweb.asm.tree.JumpInsnNode;
 import org.objectweb.asm.tree.LabelNode;
+import org.objectweb.asm.tree.LdcInsnNode;
 import org.objectweb.asm.tree.MethodInsnNode;
 import org.objectweb.asm.tree.VarInsnNode;
 
@@ -47,6 +48,18 @@ protected void registerTransformers() {
 				popNode11
 			));
 		});
+		this.registerMethodTransformer("pa", "a", "(Llp;)V", "net/minecraft/network/NetHandlerPlayServer", "processPlayerDigging", "(Lnet/minecraft/network/play/client/CPacketPlayerDigging;)V", methodNode -> {
+			AbstractInsnNode targetNode1 = ASMUtil.findFirstInsnByType(methodNode, AbstractInsnNode.LDC_INSN);
+			while (!((LdcInsnNode) targetNode1).cst.equals(1.5D)) {
+				targetNode1 = ASMUtil.findFirstInsnByType(methodNode, AbstractInsnNode.LDC_INSN, targetNode1);
+			}
+
+			methodNode.instructions.insert(targetNode1, ASMUtil.listOf(
+				new VarInsnNode(Opcodes.ALOAD, 0),
+				new MethodInsnNode(Opcodes.INVOKESTATIC, "meldexun/reachfix/asm/hook/NetHandlerPlayServerHook", "getEyeHeightMinusOnePointFive", "(Lnet/minecraft/network/NetHandlerPlayServer;)D", false),
+				new InsnNode(Opcodes.DADD)
+			));
+		});
 		this.registerMethodTransformer("bsc", "a", "(Lams;)V", "net/minecraft/client/network/NetworkPlayerInfo", "setGameType", "(Lnet/minecraft/world/GameType;)V", methodNode -> {
 			methodNode.instructions.insert(ASMUtil.listOf(
 				new VarInsnNode(Opcodes.ALOAD, 0),

diff --git a/src/main/java/meldexun/reachfix/asm/hook/NetHandlerPlayServerHook.java b/src/main/java/meldexun/reachfix/asm/hook/NetHandlerPlayServerHook.java
@@ -26,4 +26,8 @@ public static boolean isEntityInRange(NetHandlerPlayServer serverHandler, Entity
 		return distance < reach + aabbRadius + 1.0D;
 	}
 
+	public static double getEyeHeightMinusOnePointFive(NetHandlerPlayServer serverHandler) {
+		return serverHandler.player.eyeHeight - 1.5D;
+	}
+
 }