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.

.gitignore

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

src/engine/gameManager/MovementManager.java

@@ -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/net/client/handlers/AcceptSubInviteHandler.java

@@ -15,7 +15,6 @@ import engine.Enum.GuildState;
 import engine.exception.MsgSendException;
 import engine.gameManager.ChatManager;
 import engine.gameManager.DbManager;
-import engine.gameManager.GuildManager;
 import engine.gameManager.SessionManager;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
@@ -27,6 +26,8 @@ import engine.objects.Guild;
 import engine.objects.GuildStatusController;
 import engine.objects.PlayerCharacter;
 
+import java.util.ArrayList;
+
 public class AcceptSubInviteHandler extends AbstractClientMsgHandler {
 
     public AcceptSubInviteHandler() {
@@ -37,74 +38,69 @@ public class AcceptSubInviteHandler extends AbstractClientMsgHandler {
     protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException {
 
         AcceptSubInviteMsg msg = (AcceptSubInviteMsg) baseMsg;
-        PlayerCharacter playerCharacter;
+        PlayerCharacter sourcePlayer;
-        Guild protectorate;
+        Guild sourceGuild;
-        Guild nation;
+        Guild targetGuild;
         Dispatch dispatch;
 
         // get PlayerCharacter of person sending sub invite
 
-        playerCharacter = SessionManager.getPlayerCharacter(origin);
+        sourcePlayer = SessionManager.getPlayerCharacter(origin);
 
-        if (playerCharacter == null)
+        if (sourcePlayer == null)
             return true;
 
-        protectorate = playerCharacter.getGuild();
+        sourceGuild = sourcePlayer.getGuild();
-        nation = (Guild) DbManager.getObject(GameObjectType.Guild, msg.guildUUID());
+        targetGuild = (Guild) DbManager.getObject(GameObjectType.Guild, msg.guildUUID());
 
         //must be source guild to sub to
 
-        if (nation == null) {
+        if (targetGuild == null) {
-            ErrorPopupMsg.sendErrorPopup(playerCharacter, 45); // Failure to swear guild
+            ErrorPopupMsg.sendErrorPopup(sourcePlayer, 45); // Failure to swear guild
             return true;
         }
-        if (protectorate == null) {
+        if (sourceGuild == null) {
-            ErrorPopupMsg.sendErrorPopup(playerCharacter, 45); // Failure to swear guild
+            ErrorPopupMsg.sendErrorPopup(sourcePlayer, 45); // Failure to swear guild
             return true;
         }
 
-        if (protectorate.equals(nation))
+        if (sourceGuild.equals(targetGuild))
             return true;
 
-        if (GuildStatusController.isGuildLeader(playerCharacter.getGuildStatus()) == false) {
+        if (GuildStatusController.isGuildLeader(sourcePlayer.getGuildStatus()) == false) {
-            ErrorPopupMsg.sendErrorMsg(playerCharacter, "Only a guild leader can accept fealty!");
+            ErrorPopupMsg.sendErrorMsg(sourcePlayer, "Only a guild leader can accept fealty!");
             return true;
         }
 
         //source guild is limited to 7 subs
         //TODO this should be based on TOL rank
 
-        if (!nation.canSubAGuild(protectorate)) {
+        if (!targetGuild.canSubAGuild(sourceGuild)) {
-            ErrorPopupMsg.sendErrorPopup(playerCharacter, 45); // Failure to swear guild
+            ErrorPopupMsg.sendErrorPopup(sourcePlayer, 45); // Failure to swear guild
             return true;
         }
 
         //all tests passed, let's Handle code
+        //Update Target Guild State.
 
-        // Update database
+        sourceGuild.upgradeGuildState(false);
 
-        if (!DbManager.GuildQueries.UPDATE_PARENT(protectorate.getObjectUUID(), nation.getObjectUUID())) {
+        //Add sub so GuildMaster can Swear in.
-            ErrorPopupMsg.sendErrorMsg(playerCharacter, "A Serious error has occured. Please post details for to ensure transaction integrity");
-            return true;
-        }
 
-        //update Guild states.
+        ArrayList<Guild> subs = targetGuild.getSubGuildList();
+        subs.add(sourceGuild);
 
-        protectorate.setNation(nation);
+        targetGuild.setGuildState(GuildState.Nation);
-        GuildManager.updateAllGuildTags(protectorate);
-        protectorate.upgradeGuildState(false);
 
-        if (nation.getGuildState() == GuildState.Sovereign)
-            nation.upgradeGuildState(true);
 
         //Let's send the message back.
 
         msg.setUnknown02(1);
-        msg.setResponse("Your guild is now a " + protectorate.getGuildState().name() + '.');
+        msg.setResponse("Your guild is now a " + sourceGuild.getGuildState().name() + '.');
-        dispatch = Dispatch.borrow(playerCharacter, msg);
+        dispatch = Dispatch.borrow(sourcePlayer, msg);
         DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
 
-        ChatManager.chatSystemInfo(playerCharacter, "Your guild is now a " + protectorate.getGuildState().name() + '.');
+        ChatManager.chatSystemInfo(sourcePlayer, "Your guild is now a " + sourceGuild.getGuildState().name() + '.');
         return true;
     }
 }

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);