Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2024-11-21 18:15:26 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3084 from Multiverse/ben/fix-getTo-null

Browse Source
This commit is contained in:
Ben Woo 2024-08-13 10:19:25 +08:00 committed by GitHub
commit 2d059eabc3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java
View File

@ -169,6 +169,10 @@ public class MVPlayerListener implements Listener {
if (event.isCancelled()) { if (event.isCancelled()) {
return; return;
} }
if (event.getTo() == null) {
Logging.fine("Player '" + event.getPlayer().getName() + "' is teleporting to a null location!");
return;
}
Player teleportee = event.getPlayer(); Player teleportee = event.getPlayer();
CommandSender teleporter = teleportee; CommandSender teleporter = teleportee;
String teleporterName = MultiverseCore.getPlayerTeleporter(teleportee.getName()); String teleporterName = MultiverseCore.getPlayerTeleporter(teleportee.getName());
@ -284,6 +288,7 @@ public class MVPlayerListener implements Listener {
} }
// The adjust should have happened much earlier. // The adjust should have happened much earlier.
if (event.getTo() == null) { if (event.getTo() == null) {
Logging.fine("Player '" + event.getPlayer().getName() + "' is portaling to NULL location.");
return; return;
} }
MultiverseWorld fromWorld = this.worldManager.getMVWorld(event.getFrom().getWorld().getName()); MultiverseWorld fromWorld = this.worldManager.getMVWorld(event.getFrom().getWorld().getName());