Quote movement code

AlexProgrammerDE · Nov 6, 2024 · f578f36 · f578f36
1 parent 685af97
commit f578f36
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/server/src/main/java/com/soulfiremc/server/pathfinding/Costs.java b/server/src/main/java/com/soulfiremc/server/pathfinding/Costs.java
@@ -143,7 +143,7 @@ public static TickResult getRequiredMiningTicks(
     // If this value adds up over all ticks to 1, the block is fully mined
     var damage = getBlockDamagePerTick(tagsState, entity, onGround, itemStack, blockType);
 
-    var creativeMode = entity != null && entity.abilities().instabuild();
+    var creativeMode = entity != null && entity.abilitiesData().instabuild();
     var willDropUsableBlockItem = correctToolUsed && !creativeMode && BlockTypeHelper.isUsableBlockItem(blockType);
 
     // Insta mine
@@ -159,7 +159,7 @@ private static float getBlockDamagePerTick(TagsState tagsState,
                                              boolean onGround,
                                              @Nullable SFItemStack itemStack,
                                              BlockType blockType) {
-    if (entity != null && entity.abilities().instabuild()) {
+    if (entity != null && entity.abilitiesData().instabuild()) {
       // We instantly break any block in creative mode
       return 1.0F;
     }

diff --git a/server/src/main/java/com/soulfiremc/server/pathfinding/graph/PathConstraint.java b/server/src/main/java/com/soulfiremc/server/pathfinding/graph/PathConstraint.java
@@ -40,7 +40,7 @@ public PathConstraint(BotConnection botConnection) {
   }
 
   public boolean doUsableBlocksDecreaseWhenPlaced() {
-    return entity == null || !entity.abilities().instabuild();
+    return entity == null || !entity.abilitiesData().instabuild();
   }
 
   public boolean isPlaceable(SFItemStack item) {

diff --git a/server/src/main/java/com/soulfiremc/server/protocol/bot/state/entity/ClientEntity.java b/server/src/main/java/com/soulfiremc/server/protocol/bot/state/entity/ClientEntity.java
@@ -107,13 +107,13 @@ private void playerTick() {
   private void livingEntityTick() {
     super.tick();
 
-    this.aiStep();
+    // this.aiStep();
 
-    if (this.isFallFlying()) {
-      this.fallFlyTicks++;
-    } else {
-      this.fallFlyTicks = 0;
-    }
+    // if (this.isFallFlying()) {
+    //  this.fallFlyTicks++;
+    //  else {
+    //  this.fallFlyTicks = 0;
+    // }
 
     if (this.isSleeping()) {
       this.xRot(0.0F);
@@ -238,10 +238,6 @@ private void sendIsSprintingIfNeeded() {
     }
   }
 
-  public AbilitiesData abilities() {
-    return dataManager.abilitiesData();
-  }
-
   public void jump() {
     jumpTriggerTime = 7;
   }