diff --git a/src/main/java/carpet/mixins/ProjectileEntity_extremeMixin.java b/src/main/java/carpet/mixins/ProjectileEntity_extremeMixin.java index 60f9789d..2d94bdf4 100644 --- a/src/main/java/carpet/mixins/ProjectileEntity_extremeMixin.java +++ b/src/main/java/carpet/mixins/ProjectileEntity_extremeMixin.java @@ -21,7 +21,7 @@ public class ProjectileEntity_extremeMixin } // calculates damage - @Redirect(method = "method_7435", expect = 1, at = @At( + @Redirect(method = "applyEnchantmentEffects", expect = 1, at = @At( value = "INVOKE", target = "Ljava/util/Random;nextGaussian()D" )) diff --git a/src/main/java/carpet/script/value/EntityValue.java b/src/main/java/carpet/script/value/EntityValue.java index 91524e4c..4d3369a7 100644 --- a/src/main/java/carpet/script/value/EntityValue.java +++ b/src/main/java/carpet/script/value/EntityValue.java @@ -444,6 +444,7 @@ public class EntityValue extends Value return; if (e instanceof ServerPlayerEntity) { + // TODO next - figure out proper way of informting client about pos changes //((ServerPlayerEntity) e).networkHandler.requestTeleport(e.x, e.y, e.z, e.yaw, e.pitch); Set set_1 = EnumSet.noneOf(PlayerPositionLookS2CPacket.Flag.class); @@ -456,15 +457,18 @@ public class EntityValue extends Value float prevYaw = e.yaw; float prevPitch = e.pitch;*/ - e.setPositionAnglesAndUpdate(x, y, z, yaw, pitch); + //((ServerPlayerEntity)e).networkHandler.teleportRequest(x - prevX, y - prevY, z - prevZ, yaw - prevYaw, pitch - prevPitch, set_1); + ((ServerPlayerEntity)e).networkHandler.teleportRequest(x, y, z, yaw, pitch, set_1); + + /*e.setPositionAnglesAndUpdate(x, y, z, yaw, pitch); ((ServerPlayerEntity) e).networkHandler.sendPacket(new PlayerPositionLookS2CPacket( - x,// - prevX, - y,// - prevY, - z,// - prevZ, - yaw,// - prevYaw, - pitch,// - prevPitch, + x - prevX, + y - prevY, + z - prevZ, + yaw - prevYaw, + pitch - prevPitch, set_1, -1) - ); + );*/ } else {