Merge branch 'refs/heads/master' into dev

TISUnion · Jul 21, 2024 · 1a7fda1 · 1a7fda1
2 parents 6719c19 + d8e0bf0
commit 1a7fda1
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/carpettisaddition/mixins/rule/sandDupingFix/FallingBlockEntityMixin.java b/src/main/java/carpettisaddition/mixins/rule/sandDupingFix/FallingBlockEntityMixin.java
@@ -44,11 +44,15 @@ public FallingBlockEntityMixin(EntityType<? extends FallingBlockEntity> entityTy
 			at = @At(
 					value = "INVOKE",
 					shift = At.Shift.AFTER,
+					//#if MC >= 12100
+					//$$ target = "Lnet/minecraft/entity/FallingBlockEntity;tickPortalTeleportation()V"
+					//#else
 					target = "Lnet/minecraft/entity/FallingBlockEntity;move(Lnet/minecraft/entity/MovementType;Lnet/minecraft/util/math/Vec3d;)V"
+					//#endif
 			),
 			cancellable = true
 	)
-	private void afterMove(CallbackInfo ci)
+	private void afterPortalTeleportation(CallbackInfo ci)
 	{
 		if (CarpetTISAdditionSettings.sandDupingFix)
 		{