Fix data consistency

AlexProgrammerDE · Nov 21, 2024 · 69955b0 · 69955b0
1 parent aae3811
commit 69955b0
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 23 deletions.
diff --git a/server/src/main/java/com/soulfiremc/server/pathfinding/execution/GapJumpAction.java b/server/src/main/java/com/soulfiremc/server/pathfinding/execution/GapJumpAction.java
@@ -67,7 +67,7 @@ public void tick(BotConnection connection) {
 
     var previousYRot = clientEntity.yRot();
     clientEntity.lookAt(RotationOrigin.EYES, targetMiddleBlock);
-    clientEntity.xRot(0);
+    clientEntity.setXRot(0);
     var newYRot = clientEntity.yRot();
 
     var yRotDifference = Math.abs(MathHelper.wrapDegrees(newYRot - previousYRot));

diff --git a/server/src/main/java/com/soulfiremc/server/pathfinding/execution/MovementAction.java b/server/src/main/java/com/soulfiremc/server/pathfinding/execution/MovementAction.java
@@ -73,7 +73,7 @@ public void tick(BotConnection connection) {
 
     var previousYRot = clientEntity.yRot();
     clientEntity.lookAt(RotationOrigin.EYES, targetMiddleBlock);
-    clientEntity.xRot(0);
+    clientEntity.setXRot(0);
     var newYRot = clientEntity.yRot();
 
     var yRotDifference = Math.abs(MathHelper.wrapDegrees(newYRot - previousYRot));

diff --git a/server/src/main/java/com/soulfiremc/server/plugins/POVServer.java b/server/src/main/java/com/soulfiremc/server/plugins/POVServer.java
@@ -956,8 +956,8 @@ public void packetSent(Session botSession, Packet packet) {
               lastZ = posRot.getZ();
 
               clientEntity.setPos(posRot.getX(), posRot.getY(), posRot.getZ());
-              clientEntity.yRot(posRot.getYaw());
-              clientEntity.xRot(posRot.getPitch());
+              clientEntity.setYRot(posRot.getYaw());
+              clientEntity.setXRot(posRot.getPitch());
             }
             case ServerboundMovePlayerPosPacket pos -> {
               lastX = pos.getX();
@@ -967,8 +967,8 @@ public void packetSent(Session botSession, Packet packet) {
               clientEntity.setPos(pos.getX(), pos.getY(), pos.getZ());
             }
             case ServerboundMovePlayerRotPacket rot -> {
-              clientEntity.yRot(rot.getYaw());
-              clientEntity.xRot(rot.getPitch());
+              clientEntity.setYRot(rot.getYaw());
+              clientEntity.setXRot(rot.getPitch());
             }
             case ServerboundAcceptTeleportationPacket teleportationPacket -> {
               // This was a forced teleport, the server should not know about it

diff --git a/server/src/main/java/com/soulfiremc/server/protocol/bot/SessionDataManager.java b/server/src/main/java/com/soulfiremc/server/protocol/bot/SessionDataManager.java
@@ -333,7 +333,7 @@ public void onPosition(ClientboundPlayerPositionPacket packet) {
 
   @EventHandler
   public void onRotation(ClientboundPlayerRotationPacket packet) {
-    localPlayer.setRotation(
+    localPlayer.setRot(
       packet.getYRot(),
       packet.getXRot()
     );
@@ -940,7 +940,7 @@ public void onEntityPos(ClientboundMoveEntityPosPacket packet) {
     }
 
     state.addPos(packet.getMoveX(), packet.getMoveY(), packet.getMoveZ());
-    state.onGround(packet.isOnGround());
+    state.setOnGround(packet.isOnGround());
   }
 
   @EventHandler
@@ -952,8 +952,8 @@ public void onEntityRot(ClientboundMoveEntityRotPacket packet) {
       return;
     }
 
-    state.setRotation(packet.getYaw(), packet.getPitch());
-    state.onGround(packet.isOnGround());
+    state.setRot(packet.getYaw(), packet.getPitch());
+    state.setOnGround(packet.isOnGround());
   }
 
   @EventHandler
@@ -979,8 +979,8 @@ public void onEntityPosRot(ClientboundMoveEntityPosRotPacket packet) {
     }
 
     state.addPos(packet.getMoveX(), packet.getMoveY(), packet.getMoveZ());
-    state.setRotation(packet.getYaw(), packet.getPitch());
-    state.onGround(packet.isOnGround());
+    state.setRot(packet.getYaw(), packet.getPitch());
+    state.setOnGround(packet.isOnGround());
   }
 
   @EventHandler
@@ -998,7 +998,7 @@ public void onEntityTeleport(ClientboundTeleportEntityPacket packet) {
       packet.getYRot(),
       packet.getXRot()
     ), packet.getRelatives()));
-    state.onGround(packet.isOnGround());
+    state.setOnGround(packet.isOnGround());
   }
 
   @EventHandler
@@ -1016,7 +1016,7 @@ public void onEntityPositionSync(ClientboundEntityPositionSyncPacket packet) {
       packet.getYRot(),
       packet.getXRot()
     ));
-    state.onGround(packet.isOnGround());
+    state.setOnGround(packet.isOnGround());
   }
 
   @EventHandler

diff --git a/server/src/main/java/com/soulfiremc/server/protocol/bot/state/entity/Entity.java b/server/src/main/java/com/soulfiremc/server/protocol/bot/state/entity/Entity.java
@@ -49,7 +49,6 @@
 
 @Slf4j
 @Getter
-@Setter
 public abstract class Entity {
   protected static final int FLAG_ONFIRE = 0;
   protected static final int FLAG_GLOWING = 6;
@@ -67,9 +66,13 @@ public abstract class Entity {
   protected final EntityType entityType;
   protected final EntityMetadataState metadataState;
   protected float fallDistance;
+  @Setter
   protected UUID uuid;
+  @Setter
   protected ObjectData data;
+  @Setter
   protected int entityId;
+  @Setter
   protected Level level;
   protected BlockState inBlockState = null;
   protected boolean firstTick = true;
@@ -125,7 +128,7 @@ public void fromAddEntityPacket(ClientboundAddEntityPacket packet) {
     data(packet.getData());
     setPos(packet.getX(), packet.getY(), packet.getZ());
     setHeadRotation(packet.getHeadYaw());
-    setRotation(packet.getYaw(), packet.getPitch());
+    setRot(packet.getYaw(), packet.getPitch());
     setDeltaMovement(packet.getMotionX(), packet.getMotionY(), packet.getMotionZ());
   }
 
@@ -136,7 +139,7 @@ public EntityMovement toMovement() {
   public void setFrom(EntityMovement entityMovement) {
     setPos(entityMovement.pos());
     setDeltaMovement(entityMovement.deltaMovement());
-    setRotation(entityMovement.yRot(), entityMovement.xRot());
+    setRot(entityMovement.yRot(), entityMovement.xRot());
   }
 
   public double x() {
@@ -233,9 +236,25 @@ public final void setBoundingBox(AABB bb) {
     this.bb = bb;
   }
 
-  public void setRotation(float yRot, float xRot) {
-    this.yRot = yRot;
-    this.xRot = xRot;
+  public void setRot(float yRot, float xRot) {
+    this.setYRot(yRot % 360.0F);
+    this.setXRot(xRot % 360.0F);
+  }
+
+  public void setYRot(float yRot) {
+    if (!Float.isFinite(yRot)) {
+      log.warn("Invalid entity y rotation: {}, discarding.", yRot);
+    } else {
+      this.yRot = yRot;
+    }
+  }
+
+  public void setXRot(float xRot) {
+    if (!Float.isFinite(xRot)) {
+      log.warn("Invalid entity x rotation: {}, discarding.", xRot);
+    } else {
+      this.xRot = Math.clamp(xRot % 360.0F, -90.0F, 90.0F);
+    }
   }
 
   public void setHeadRotation(float headYRot) {
@@ -608,7 +627,6 @@ public boolean updateFluidHeightAndDoFluidPushing(TagKey<FluidType> fluidTag, do
                 height = Math.max(f - lv.minY, height);
                 if (pushedByFluid) {
                   var flowDirection = lv4.getFlow(this.level(), lv3);
-                  System.out.println(flowDirection);
                   if (height < 0.4) {
                     flowDirection = flowDirection.mul(height);
                   }

diff --git a/server/src/main/java/com/soulfiremc/server/protocol/bot/state/entity/LivingEntity.java b/server/src/main/java/com/soulfiremc/server/protocol/bot/state/entity/LivingEntity.java
@@ -58,7 +58,7 @@ public void tick() {
     }
 
     if (this.isSleeping()) {
-      this.xRot(0.0F);
+      this.setXRot(0.0F);
     }
 
     var currentScale = this.getScale();

diff --git a/server/src/main/java/com/soulfiremc/server/protocol/bot/state/entity/Player.java b/server/src/main/java/com/soulfiremc/server/protocol/bot/state/entity/Player.java
@@ -60,7 +60,7 @@ public Player(Level level, GameProfile gameProfile) {
   public void tick() {
     this.noPhysics = this.isSpectator();
     if (this.isSpectator()) {
-      this.onGround(false);
+      this.setOnGround(false);
     }
 
     this.wasUnderwater = this.isEyeInFluid(FluidTags.WATER);