EpicKnarvik97/Stargate
2
0
Fork 0
Code Issues 8 Pull Requests Projects 1 Releases 28 Wiki Activity

Stops cancelling END_GATEWAY teleportation events, as those prevented teleportation from end gateways
All checks were successful
EpicKnarvik97/Stargate/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Kristian Knarvik
2026-01-23 12:51:16 +01:00
parent 69e334c195
commit bbb5c5184e
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/net/knarcraft/stargate/listener/StargateTeleportListener.java
View File

@@ -69,9 +69,10 @@ public class StargateTeleportListener implements Listener {
//Block normal portal teleportation if teleporting from a stargate //Block normal portal teleportation if teleporting from a stargate
if (!event.isCancelled() && (cause == PlayerTeleportEvent.TeleportCause.NETHER_PORTAL || if (!event.isCancelled() && (cause == PlayerTeleportEvent.TeleportCause.NETHER_PORTAL ||
cause == PlayerTeleportEvent.TeleportCause.END_GATEWAY ||
cause == PlayerTeleportEvent.TeleportCause.END_PORTAL) cause == PlayerTeleportEvent.TeleportCause.END_PORTAL)
&& PortalHandler.getByAdjacentEntrance(event.getFrom()) != null) { && PortalHandler.getByAdjacentEntrance(event.getFrom()) != null) {
Stargate.debug("StargateTeleportListener::onPlayerTeleport",
"Cancelled vanilla portal event to " + event.getTo());
event.setCancelled(true); event.setCancelled(true);
} }
} }

2
src/main/java/net/knarcraft/stargate/portal/teleporter/PlayerTeleporter.java
View File

@@ -69,10 +69,12 @@ public class PlayerTeleporter extends Teleporter {
//If no event is passed in, assume it's a teleport, and act as such //If no event is passed in, assume it's a teleport, and act as such
if (event == null) { if (event == null) {
success &= player.teleport(exit); success &= player.teleport(exit);
Stargate.debug("PlayerTeleporter::teleportPlayer", "Teleported player to " + exit);
} else { } else {
//Set the exit location of the event //Set the exit location of the event
success &= !event.isCancelled(); success &= !event.isCancelled();
event.setTo(exit); event.setTo(exit);
Stargate.debug("PlayerTeleporter::teleportPlayer", "Overwrote movement event to " + exit);
} }
//Set the velocity of the teleported player after the teleportation is finished //Set the velocity of the teleported player after the teleportation is finished