feat: fixPlayerPositionNaN

Author: OptiJava

README-en.md

@@ -377,6 +377,24 @@ Allow spectators to modify containers
 - Acceptable value: `true` `false`
 - Categories: `Feature`
 
+### removeDataModifyRestriction
+
+Vanilla has restriction for /data modify entity <real player> , no modification of `Health` etc.
+
+This rule can remove the restriction.
+
+- Default value: `false`
+- Acceptable value: `true` `false`
+- Categories: `Command`, `Experimental`
+
+### fixPlayerPositionNaN
+
+In Entity.setPos(...), check and prevent `NaN`.
+
+- Default value: `false`
+- Acceptable value: `true` `false`
+- Categories: `BugFix`
+
 ## Command
 
 ### player xxx tp

README.md

@@ -378,6 +378,22 @@ DispenserBlockEntity dispenserBlockEntity = (DispenserBlockEntity)blockPointerIm
 - Acceptable value: `true` `false`
 - Categories: `Feature`
 
+### removeDataModifyRestriction
+
+原版对于/data modify entity <玩家> 有限制，比如不能修改`Health`，本规则移除了此限制
+
+- Default value: `false`
+- Acceptable value: `true` `false`
+- Categories: `Command`, `Experimental`
+
+### fixPlayerPositionNaN
+
+在Entity.setPos(...)方法中，检查输入值是否包含`NaN`
+
+- Default value: `false`
+- Acceptable value: `true` `false`
+- Categories: `BugFix`
+
 ## 指令
 
 ### player xxx tp

src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetSettings.java

@@ -201,4 +201,9 @@ public class OptCarpetSettings {
             categories = {RuleCategory.COMMAND, RuleCategory.EXPERIMENTAL,OCA}
     )
     public static boolean removeDataModifyRestriction = false;
+
+    @Rule(
+            categories = {RuleCategory.BUGFIX, OCA}
+    )
+    public static boolean fixPlayerPositionNaN = false;
 }

src/main/java/io/github/optijava/opt_carpet_addition/mixins/rule/fixPlayerPositionNaN/Entity_Mixin.java

@@ -0,0 +1,29 @@
+package io.github.optijava.opt_carpet_addition.mixins.rule.fixPlayerPositionNaN;
+
+import io.github.optijava.opt_carpet_addition.OptCarpetAddition;
+import io.github.optijava.opt_carpet_addition.OptCarpetSettings;
+import net.minecraft.world.entity.Entity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(Entity.class)
+public class Entity_Mixin {
+
+    @Inject(
+            method = "setPosRaw",
+            at = @At("HEAD"),
+            cancellable = true
+    )
+    public void injectTick(final double x, final double y, final double z, CallbackInfo ci) {
+        if (OptCarpetSettings.fixPlayerPositionNaN) {
+            Entity ths = (Entity)(Object)this;
+
+            if (Double.isNaN(x) || Double.isNaN(y) || Double.isNaN(z)) {
+                OptCarpetAddition.LOGGER.error("Detect NaN position in Entity " + ths.getStringUUID(), new NumberFormatException());
+                ci.cancel();
+            }
+        }
+    }
+}

src/main/resources/assets/opt-carpet-addition/lang/en_us.json

@@ -66,5 +66,7 @@
   "carpet.rule.allowSpectatorToModifyContainer.name": "Allow spectators to modify containers",
   "carpet.rule.allowSpectatorToModifyContainer.desc": "Allow spectators to modify containers",
   "carpet.rule.removeDataModifyRestriction.name": "Remove Data Modify Restriction",
-  "carpet.rule.removeDataModifyRestriction.desc": "Allow modifying data for players"
+  "carpet.rule.removeDataModifyRestriction.desc": "Allow modifying data for players",
+  "carpet.rule.fixPlayerPositionNaN.name": "Fix NaN in the pos of players",
+  "carpet.rule.fixPlayerPositionNaN.desc": "Prevent when writing NaN into pos"
 }

src/main/resources/assets/opt-carpet-addition/lang/zh_cn.json

@@ -66,6 +66,8 @@
   "carpet.rule.allowSpectatorToModifyContainer.name": "允许旁观者操作容器",
   "carpet.rule.allowSpectatorToModifyContainer.desc": "允许旁观者在GUI操作容器",
   "carpet.rule.removeDataModifyRestriction.name": "移除Data指令修改限制",
-  "carpet.rule.removeDataModifyRestriction.desc": "允许用/data modify entity修改玩家数据"
+  "carpet.rule.removeDataModifyRestriction.desc": "允许用/data modify entity修改玩家数据",
+  "carpet.rule.fixPlayerPositionNaN.name": "修复玩家位置NaN",
+  "carpet.rule.fixPlayerPositionNaN.desc": "当玩家位置被写入NaN时，阻止写入"
 }
 

src/main/resources/opt-carpet-addition.mixins.json

@@ -24,7 +24,8 @@
     //? }
     "logger.blockUpdate.LogCommand_Mixin",
     "rule.allowSpectatorToModifyContainer.ServerGamePacketListenerImpl_Mixin",
-    "rule.removeDataModifyRestriction.EntityDataAccessor_Mixin"
+    "rule.removeDataModifyRestriction.EntityDataAccessor_Mixin",
+    "rule.fixPlayerPositionNaN.Entity_Mixin"
   ],
   "client": [
     "rule.unescapeChatMessage.ChatMessageC2SPacket_Mixin"