EpicKnarvik97/Stargate
2
0
Fork 0
Code Issues 7 Pull Requests Projects 1 Releases 27 Wiki Activity

Fixes boats sometimes not detecting the portal before the player detects the portal

Browse Source
This commit is contained in:
Kristian Knarvik
2021-02-23 19:43:49 +01:00
parent 5f685b2460
commit 4acea17ba3
6 changed files with 43 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/net/knarcraft/stargate/portal/Portal.java
View File

@ -10,6 +10,7 @@ import net.knarcraft.stargate.event.StargateCloseEvent;
import net.knarcraft.stargate.event.StargateDeactivateEvent;
import net.knarcraft.stargate.event.StargateOpenEvent;
import net.knarcraft.stargate.event.StargatePortalEvent;
import net.knarcraft.stargate.utility.EntityHelper;
import org.bukkit.Axis;
import org.bukkit.ChatColor;
import org.bukkit.Location;
@ -595,8 +596,10 @@ public class Portal {
if (gate.getLayout().getExit() != null) {
BlockLocation exit = getBlockAt(gate.getLayout().getExit());
int back = (isBackwards()) ? -1 : 1;
double entitySize = Math.ceil((float) Math.max(entity.getBoundingBox().getWidthX(), entity.getBoundingBox().getWidthZ()));
exitLocation = exit.modRelativeLoc(0D, 0D, entitySize, traveller.getYaw(), traveller.getPitch(), modX * back, 1, modZ * back);
//TODO: Improve positioning to place the entity just far enough from the portal not to suffocate
double entitySize = EntityHelper.getEntityMaxSize(entity);
exitLocation = exit.modRelativeLoc(0D, 0D, entitySize, traveller.getYaw(),
traveller.getPitch(), modX * back, 1, modZ * back);
} else {
Stargate.log.log(Level.WARNING, Stargate.getString("prefix") + "Missing destination point in .gate file " + gate.getFilename());
}

1
src/main/java/net/knarcraft/stargate/portal/PortalHandler.java
View File

@ -588,7 +588,6 @@ public class PortalHandler {
}
for (BlockLocation adjacentPosition : adjacentPositions) {
Stargate.debug("getByAdjacentEntrance", "Testing" + adjacentPosition);
Portal portal = lookupEntrances.get(adjacentPosition);
if (portal != null) {
return portal;