FatBoy/lakebane
1
0
Fork 0
forked from MagicBane/Server
Code Issues 1 Pull Requests Projects Releases Wiki Activity

data load fixes

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-01-03 20:39:18 -06:00
parent e330f190fe
commit c92316f03e
3 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/handlers/MoveToPointHandler.java
+15 -9
View File
@@ -28,6 +28,8 @@ import engine.server.MBServerStatics;
import java.awt.*;
import java.awt.geom.Line2D;
import java.util.HashSet;
public class MoveToPointHandler extends AbstractClientMsgHandler {
public MoveToPointHandler() {
@@ -46,24 +48,28 @@ public class MoveToPointHandler extends AbstractClientMsgHandler {
Line2D travelLine = new Line2D.Float();
Vector3fImmutable endLoc = new Vector3fImmutable(msg.getEndLat(),msg.getEndAlt(),msg.getEndLon());
travelLine.setLine(pc.loc.x,pc.loc.z,endLoc.x,endLoc.z);
for(AbstractWorldObject awo : WorldGrid.getObjectsInRangePartial(pc.loc, pc.loc.distance(endLoc), MBServerStatics.MASK_BUILDING)){
float movementDistance = 185 + pc.loc.distance(endLoc);
HashSet<AbstractWorldObject> awoList = WorldGrid.getObjectsInRangePartial(pc.loc, movementDistance, MBServerStatics.MASK_BUILDING);
for(AbstractWorldObject awo : awoList){
Building building = (Building)awo;
Rectangle.Float boundsRect = new Rectangle.Float();
boundsRect.setRect(building.getBounds().getHalfExtents().x, building.getBounds().getHalfExtents().y, building.getBounds().getHalfExtents().x * 2,building.getBounds().getHalfExtents().y * 2);
if(travelLine.intersects(boundsRect)){
boundsRect.setRect(building.loc.x + building.getBounds().getHalfExtents().x, building.loc.z + building.getBounds().getHalfExtents().y, building.getBounds().getHalfExtents().x * 2,building.getBounds().getHalfExtents().y * 2);
//if(travelLine.intersects(boundsRect)){
//collided with building
for(Mesh mesh : building.buildingMeshes)
if(mesh.MeshCollides(travelLine,pc.getCharacterHeight())){
for(Triangle tri : mesh.triangles){
if(tri.collides(travelLine)){
for(Mesh mesh : building.buildingMeshes) {
float height = pc.getCharacterHeight();
if (height < mesh.meshHeight) {
for (Triangle tri : mesh.triangles) {
if (tri.collides(travelLine)) {
ChatManager.chatSystemInfo(pc, "Collision Detected");
return true;
}
}
}
}
}
//}
}
ChatManager.chatSystemInfo(pc, "No Collision Detected");
MovementManager.movement(msg, pc);