Merge branch 'playercollision-1' of http://repo.magicbane.com/Preston/prestonbane into playercollision-1

This reverts commit 1c31070fc8.

.gitignore

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

src/engine/objects/PlayerCharacter.java

@@ -174,6 +174,7 @@ public class PlayerCharacter extends AbstractCharacter {
     private boolean isTeleporting = false;
     private boolean dirtyLoad = true;
     private final ReadWriteLock dirtyLock = new ReentrantReadWriteLock(true);
+    private Bounds playerBounds;
 
     /**
      * No Id Constructor
@@ -206,6 +207,10 @@ public class PlayerCharacter extends AbstractCharacter {
 
         this.guildStatus = new AtomicInteger(0);
         this.bindBuildingID = -1;
+
+        this.playerBounds = Bounds.borrow();
+        playerBounds.setBounds(this.getLoc());
+        this.playerBounds.setBounds(this);
     }
 
     /**
@@ -269,11 +274,60 @@ public class PlayerCharacter extends AbstractCharacter {
 
         this.hash = rs.getString("hash");
 
+        this.playerBounds = Bounds.borrow();
+        playerBounds.setBounds(this.getLoc());
+        this.playerBounds.setBounds(this);
+
 
         // For debugging skills
         // CharacterSkill.printSkills(this);
     }
 
+    public void updateBounds() {
+        this.playerBounds.setBounds(this);
+        this.checkCollisionsWithOtherPlayers();
+    }
+
+    public void checkCollisionsWithOtherPlayers() {
+        HashSet<AbstractWorldObject> nearbyObjects = WorldGrid.getObjectsInRangePartial(this, MBServerStatics.CHARACTER_LOAD_RANGE, MBServerStatics.MASK_PLAYER);
+        for (AbstractWorldObject obj : nearbyObjects) {
+            if (obj instanceof PlayerCharacter && obj != this) {
+                PlayerCharacter otherPlayer = (PlayerCharacter) obj;
+                if (Bounds.collide(this.getBounds(), otherPlayer.getBounds(), 0.1f)) {
+                    System.out.println("Collision detected with player: " + otherPlayer.getFirstName());
+                    ChatManager.chatSystemInfo(otherPlayer, "Has Collided with YOU");
+                    // Handle collision with other player
+                    handleCollisionWithPlayer(otherPlayer);
+                }
+            }
+        }
+    }
+
+    private void handleCollisionWithPlayer(PlayerCharacter otherPlayer) {
+        Vector3fImmutable myPos = this.getLoc();
+        Vector3fImmutable otherPlayerPos = otherPlayer.getLoc();
+
+        // Calculate direction vector
+        Vector3fImmutable direction = myPos.subtract(otherPlayerPos).normalize();
+
+        // Move players apart
+        float separationDistance = 1.0f; // Adjust this value as needed
+        Vector3fImmutable myNewPos = myPos.add(direction.mult(separationDistance / 2));
+        Vector3fImmutable otherPlayerNewPos = otherPlayerPos.subtract(direction.mult(separationDistance / 2.0f));
+
+        // Update positions
+        this.setLoc(myNewPos);
+        otherPlayer.setLoc(otherPlayerNewPos);
+
+        // Refresh both players in the world
+        WorldGrid.updateObject(this);
+        WorldGrid.updateObject(otherPlayer);
+
+        // Refresh both players in the world
+        WorldGrid.updateObject(this);
+        WorldGrid.updateObject(otherPlayer);
+    }
+
     public static Building getUpdatedBindBuilding(PlayerCharacter player) {
         Building returnBuilding = null;
 
@@ -4882,6 +4936,7 @@ public class PlayerCharacter extends AbstractCharacter {
     @Override
     public void updateLocation() {
 
+        this.updateBounds();
 
         if (!this.isMoving())
             return;