MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Duplicate region field removed and inlined.

Browse Source
This commit is contained in:
MagicBot
2023-04-29 12:33:21 -04:00
parent de38c8727a
commit e554171e22
16 changed files with 95 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/math/Bounds.java
+2 -2
View File
@@ -358,7 +358,7 @@ public class Bounds {
//player is inside building region, skip collision check. we only do collision from the outside.
if (player.getRegion() != null && player.getRegion().parentBuildingID == building.getObjectUUID())
if (player.region != null && player.region.parentBuildingID == building.getObjectUUID())
continue;
if (building.getBounds().colliders == null)
continue;
@@ -366,7 +366,7 @@ public class Bounds {
for (Colliders collider: building.getBounds().colliders) {
//links are what link together buildings, allow players to run through them only if they are in a building already.
if (collider.isLink() && player.getRegion() != null)
if (collider.isLink() && player.region != null)
continue;
if (collider.getDoorID() != 0 && building.isDoorOpen(collider.getDoorID()))
continue;