Merge pull request #2948 from Multiverse/fix-null-teleporter

dumptruckman · web-flow · commit 8865cfb53ff9 · 2023-08-20T23:23:15.000-04:00
Fix teleporter reference being null
diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java
@@ -170,7 +170,7 @@ public void playerTeleport(PlayerTeleportEvent event) {
             return;
         }
         Player teleportee = event.getPlayer();
-        CommandSender teleporter = null;
+        CommandSender teleporter = teleportee;
         String teleporterName = MultiverseCore.getPlayerTeleporter(teleportee.getName());
         if (teleporterName != null) {
             if (teleporterName.equals("CONSOLE")) {

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ public void playerTeleport(PlayerTeleportEvent event) {`
`170`	`170`	`return;`
`171`	`171`	`}`
`172`	`172`	`Player teleportee = event.getPlayer();`
`173`		`- CommandSender teleporter = null;`
	`173`	`+ CommandSender teleporter = teleportee;`
`174`	`174`	`String teleporterName = MultiverseCore.getPlayerTeleporter(teleportee.getName());`
`175`	`175`	`if (teleporterName != null) {`
`176`	`176`	`if (teleporterName.equals("CONSOLE")) {`