Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 962bebab6c | |||
| a67fee76c3 | |||
| d22ff916bf | |||
| 2d1da7679e | |||
| 549a381174 | |||
| 43563aeb14 | |||
| 7a4c2fe72a | |||
| 24cc6af147 |
@@ -24,3 +24,8 @@
|
|||||||
hs_err_pid*
|
hs_err_pid*
|
||||||
replay_pid*
|
replay_pid*
|
||||||
|
|
||||||
|
*.idea/
|
||||||
|
Server.iml
|
||||||
|
*.gitignore
|
||||||
|
prestonbane.iml
|
||||||
|
qodana.yaml
|
||||||
@@ -88,7 +88,7 @@ public enum MovementManager {
|
|||||||
|
|
||||||
// if (msg.getEndLat() < 0)
|
// if (msg.getEndLat() < 0)
|
||||||
// msg.setEndLat(0);
|
// msg.setEndLat(0);
|
||||||
//
|
//
|
||||||
// if (msg.getEndLon() > 0)
|
// if (msg.getEndLon() > 0)
|
||||||
// msg.setEndLon(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()) {
|
if (toMove.getObjectType() == GameObjectType.PlayerCharacter && ((PlayerCharacter) toMove).isTeleportMode()) {
|
||||||
toMove.teleport(endLocation);
|
toMove.teleport(endLocation);
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ public class Bounds {
|
|||||||
Bounds identityBounds = Bounds.borrow();
|
Bounds identityBounds = Bounds.borrow();
|
||||||
identityBounds.setBounds(location);
|
identityBounds.setBounds(location);
|
||||||
|
|
||||||
collisionState = collide(targetBounds, identityBounds, 0.0f);
|
collisionState = collide(targetBounds, identityBounds, 0.1f);
|
||||||
identityBounds.release();
|
identityBounds.release();
|
||||||
return collisionState;
|
return collisionState;
|
||||||
}
|
}
|
||||||
@@ -267,6 +267,45 @@ public class Bounds {
|
|||||||
return collidePoint;
|
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) {
|
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 denominator = ((x2 - x1) * (y4 - y3)) - ((y2 - y1) * (x4 - x3));
|
||||||
float numerator1 = ((y1 - y3) * (x4 - x3)) - ((x1 - x3) * (y4 - y3));
|
float numerator1 = ((y1 - y3) * (x4 - x3)) - ((x1 - x3) * (y4 - y3));
|
||||||
|
|||||||
@@ -26,7 +26,6 @@ import engine.job.JobScheduler;
|
|||||||
import engine.jobs.DeferredPowerJob;
|
import engine.jobs.DeferredPowerJob;
|
||||||
import engine.jobs.FinishSpireEffectJob;
|
import engine.jobs.FinishSpireEffectJob;
|
||||||
import engine.jobs.NoTimeJob;
|
import engine.jobs.NoTimeJob;
|
||||||
import engine.math.Bounds;
|
|
||||||
import engine.math.FastMath;
|
import engine.math.FastMath;
|
||||||
import engine.math.Vector3fImmutable;
|
import engine.math.Vector3fImmutable;
|
||||||
import engine.net.ByteBufferWriter;
|
import engine.net.ByteBufferWriter;
|
||||||
@@ -269,9 +268,6 @@ public class PlayerCharacter extends AbstractCharacter {
|
|||||||
|
|
||||||
this.hash = rs.getString("hash");
|
this.hash = rs.getString("hash");
|
||||||
|
|
||||||
|
|
||||||
// For debugging skills
|
|
||||||
// CharacterSkill.printSkills(this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Building getUpdatedBindBuilding(PlayerCharacter player) {
|
public static Building getUpdatedBindBuilding(PlayerCharacter player) {
|
||||||
@@ -4565,9 +4561,6 @@ public class PlayerCharacter extends AbstractCharacter {
|
|||||||
|
|
||||||
this.charItemManager = new CharacterItemManager(this);
|
this.charItemManager = new CharacterItemManager(this);
|
||||||
|
|
||||||
Bounds playerBounds = Bounds.borrow();
|
|
||||||
playerBounds.setBounds(this.getLoc());
|
|
||||||
this.setBounds(playerBounds);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -5363,6 +5356,7 @@ public class PlayerCharacter extends AbstractCharacter {
|
|||||||
moveToMsg.setSourceType(GameObjectType.PlayerCharacter.ordinal());
|
moveToMsg.setSourceType(GameObjectType.PlayerCharacter.ordinal());
|
||||||
moveToMsg.setSourceID(this.getObjectUUID());
|
moveToMsg.setSourceID(this.getObjectUUID());
|
||||||
|
|
||||||
|
|
||||||
Dispatch dispatch = Dispatch.borrow(this, moveToMsg);
|
Dispatch dispatch = Dispatch.borrow(this, moveToMsg);
|
||||||
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
|
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user