Adjusted the distance check for players in player's path, effectively making the collision area of players larger. This can be changed in Bounds PlayerCollisionPoint method by increasing or decreasing the minDistance var.

This reverts commit 1c31070fc8.

.gitignore

@@ -24,3 +24,8 @@
 hs_err_pid*
 replay_pid*
 
+*.idea/
+Server.iml
+*.gitignore
+prestonbane.iml
+qodana.yaml

src/engine/gameManager/MovementManager.java

@@ -88,7 +88,7 @@ public enum MovementManager {
 
 //		if (msg.getEndLat() < 0)
 //			msg.setEndLat(0);
-//		
+//
 //		if (msg.getEndLon() > 0)
 //			msg.setEndLon(0);
 
@@ -216,6 +216,16 @@ public enum MovementManager {
 
         }
 
+        if (toMove.getObjectType().equals(GameObjectType.PlayerCharacter)) {
+            Vector3fImmutable playerCollidePoint = Bounds.PlayerCollisionPoint((PlayerCharacter) toMove, toMove.getLoc(), endLocation);
+
+            if (playerCollidePoint != null) {
+                msg.setEndCoord(playerCollidePoint);
+                endLocation = playerCollidePoint;
+                collide = true;
+            }
+        }
+
         if (toMove.getObjectType() == GameObjectType.PlayerCharacter && ((PlayerCharacter) toMove).isTeleportMode()) {
             toMove.teleport(endLocation);
             return;

src/engine/math/Bounds.java

@@ -81,7 +81,7 @@ public class Bounds {
         Bounds identityBounds = Bounds.borrow();
         identityBounds.setBounds(location);
 
-        collisionState = collide(targetBounds, identityBounds, 0.0f);
+        collisionState = collide(targetBounds, identityBounds, 0.1f);
         identityBounds.release();
         return collisionState;
     }
@@ -267,6 +267,45 @@ public class Bounds {
         return collidePoint;
     }
 
+    public static Vector3fImmutable PlayerCollisionPoint(PlayerCharacter player, Vector3fImmutable start, Vector3fImmutable end) {
+        Vector3fImmutable collidePoint = null;
+        float distance = player.getLoc().distance2D(end);
+
+        // Check for building collisions first
+        collidePoint = PlayerBuildingCollisionPoint(player, start, end);
+        if (collidePoint != null) {
+            return collidePoint;
+        }
+
+        // Now check for player collisions
+        HashSet<AbstractWorldObject> nearbyPlayers = WorldGrid.getObjectsInRangePartial(player, distance + 2, MBServerStatics.MASK_PLAYER);
+        float minDistance = 5.0f; // Minimum distance between players
+
+        for (AbstractWorldObject awo : nearbyPlayers) {
+            PlayerCharacter otherPlayer = (PlayerCharacter) awo;
+            if (otherPlayer == player) continue;
+
+            Vector3fImmutable otherLoc = otherPlayer.getLoc();
+            Vector3fImmutable closestPoint = getClosestPointOnLine(start, end, otherLoc);
+
+            if (closestPoint.distance2D(otherLoc) < minDistance) {
+                // Collision detected, adjust end point
+                Vector3fImmutable pushVector = closestPoint.subtract(otherLoc).normalize();
+                collidePoint = closestPoint.add(pushVector.scaleAdd(minDistance, Vector3fImmutable.ZERO));
+                break;
+            }
+        }
+
+        return collidePoint != null ? collidePoint : end;
+    }
+
+    private static Vector3fImmutable getClosestPointOnLine(Vector3fImmutable lineStart, Vector3fImmutable lineEnd, Vector3fImmutable point) {
+        Vector3fImmutable line = lineEnd.subtract(lineStart);
+        float t = point.subtract(lineStart).dot(line) / line.dot(line);
+        t = Math.max(0, Math.min(1, t));
+        return lineStart.add(line.scaleAdd(t, Vector3fImmutable.ZERO));
+    }
+
     public static boolean linesTouching(float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4) {
         float denominator = ((x2 - x1) * (y4 - y3)) - ((y2 - y1) * (x4 - x3));
         float numerator1 = ((y1 - y3) * (x4 - x3)) - ((x1 - x3) * (y4 - y3));

src/engine/mobileAI/MobAI.java

@@ -693,6 +693,8 @@ public class MobAI {
                     DefaultLogic(mob);
                     break;
             }
+            if(mob.isAlive())
+                RecoverHealth(mob);
         } catch (Exception e) {
             Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: DetermineAction" + " " + e.getMessage());
         }
@@ -808,7 +810,7 @@ public class MobAI {
                         chaseTarget(mob);
                     break;
                 case GuardMinion:
-                    if (!mob.npcOwner.isAlive() || ((Mob) mob.npcOwner).despawned)
+                    if (!mob.npcOwner.isAlive() && mob.getCombatTarget() == null)
                         randomGuardPatrolPoint(mob);
                     else {
                         if (mob.getCombatTarget() != null) {
@@ -827,6 +829,7 @@ public class MobAI {
                         chaseTarget(mob);
                     }
                     break;
+
             }
         } catch (Exception e) {
             Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: CheckMobMovement" + " " + e.getMessage());
@@ -1043,7 +1046,6 @@ public class MobAI {
                     mob.setCombatTarget(newTarget);
 
             }
-
             CheckMobMovement(mob);
             CheckForAttack(mob);
         } catch (Exception e) {
@@ -1054,24 +1056,9 @@ public class MobAI {
     public static void GuardMinionLogic(Mob mob) {
 
         try {
-            if (!mob.npcOwner.isAlive()) {
-
-                if (mob.getCombatTarget() == null) {
-                    CheckForPlayerGuardAggro(mob);
-                } else {
-
-                    AbstractWorldObject newTarget = ChangeTargetFromHateValue(mob);
-
-                    if (newTarget != null) {
-
-                        if (newTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
-                            if (GuardCanAggro(mob, (PlayerCharacter) newTarget))
-                                mob.setCombatTarget(newTarget);
-                        } else
-                            mob.setCombatTarget(newTarget);
-
-                    }
-                }
+            boolean isComanded = mob.npcOwner.isAlive();
+            if (!isComanded) {
+                GuardCaptainLogic(mob);
             }else {
                 if (mob.npcOwner.getCombatTarget() != null)
                     mob.setCombatTarget(mob.npcOwner.getCombatTarget());
@@ -1110,22 +1097,6 @@ public class MobAI {
                 CheckMobMovement(mob);
 
             CheckForAttack(mob);
-
-            //recover health
-
-            if (mob.getTimestamps().containsKey("HEALTHRECOVERED") == false)
-                mob.getTimestamps().put("HEALTHRECOVERED", System.currentTimeMillis());
-
-            if (mob.isSit() && mob.getTimeStamp("HEALTHRECOVERED") < System.currentTimeMillis() + 3000)
-                if (mob.getHealth() < mob.getHealthMax()) {
-
-                    float recoveredHealth = mob.getHealthMax() * ((1 + mob.getBonuses().getFloatPercentAll(Enum.ModType.HealthRecoverRate, Enum.SourceType.None)) * 0.01f);
-                    mob.setHealth(mob.getHealth() + recoveredHealth);
-                    mob.getTimestamps().put("HEALTHRECOVERED", System.currentTimeMillis());
-
-                    if (mob.getHealth() > mob.getHealthMax())
-                        mob.setHealth(mob.getHealthMax());
-                }
         } catch (Exception e) {
             Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: PetLogic" + " " + e.getMessage());
         }
@@ -1379,4 +1350,22 @@ public class MobAI {
         }
         return null;
     }
+
+    public static void RecoverHealth(Mob mob){
+        //recover health
+
+        if (mob.getTimestamps().containsKey("HEALTHRECOVERED") == false)
+            mob.getTimestamps().put("HEALTHRECOVERED", System.currentTimeMillis());
+
+        if (mob.isSit() && mob.getTimeStamp("HEALTHRECOVERED") < System.currentTimeMillis() + 3000)
+            if (mob.getHealth() < mob.getHealthMax()) {
+
+                float recoveredHealth = mob.getHealthMax() * ((1 + mob.getBonuses().getFloatPercentAll(Enum.ModType.HealthRecoverRate, Enum.SourceType.None)) * 0.01f);
+                mob.setHealth(mob.getHealth() + recoveredHealth);
+                mob.getTimestamps().put("HEALTHRECOVERED", System.currentTimeMillis());
+
+                if (mob.getHealth() > mob.getHealthMax())
+                    mob.setHealth(mob.getHealthMax());
+            }
+    }
 }

src/engine/objects/PlayerCharacter.java

@@ -26,7 +26,6 @@ import engine.job.JobScheduler;
 import engine.jobs.DeferredPowerJob;
 import engine.jobs.FinishSpireEffectJob;
 import engine.jobs.NoTimeJob;
-import engine.math.Bounds;
 import engine.math.FastMath;
 import engine.math.Vector3fImmutable;
 import engine.net.ByteBufferWriter;
@@ -269,9 +268,6 @@ public class PlayerCharacter extends AbstractCharacter {
 
         this.hash = rs.getString("hash");
 
-
-        // For debugging skills
-        // CharacterSkill.printSkills(this);
     }
 
     public static Building getUpdatedBindBuilding(PlayerCharacter player) {
@@ -4565,9 +4561,6 @@ public class PlayerCharacter extends AbstractCharacter {
 
         this.charItemManager = new CharacterItemManager(this);
 
-        Bounds playerBounds = Bounds.borrow();
-        playerBounds.setBounds(this.getLoc());
-        this.setBounds(playerBounds);
     }
 
     @Override
@@ -5363,6 +5356,7 @@ public class PlayerCharacter extends AbstractCharacter {
         moveToMsg.setSourceType(GameObjectType.PlayerCharacter.ordinal());
         moveToMsg.setSourceID(this.getObjectUUID());
 
+
         Dispatch dispatch = Dispatch.borrow(this, moveToMsg);
         DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);