27 lines
1.1 KiB
Diff
27 lines
1.1 KiB
Diff
|
From 9bb3098ad4fb9a1bcdf99d80aeaf3b8d32971703 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thinkofdeath <thinkofdeath@spigotmc.org>
|
||
|
|
Date: Sun, 11 May 2014 11:24:20 +0100
|
||
|
|
Subject: [PATCH] Don't fire PlayerPortalEvent when we don't have a target
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
||
|
|
index a4a59ee..355e589 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||
|
|
@@ -609,6 +609,12 @@ public abstract class PlayerList {
|
||
|
|
}
|
||
|
|
|
||
|
|
TravelAgent agent = exit != null ? (TravelAgent) ((CraftWorld) exit.getWorld()).getHandle().getTravelAgent() : org.bukkit.craftbukkit.CraftTravelAgent.DEFAULT; // return arbitrary TA to compensate for implementation dependent plugins
|
||
|
|
+ // Spigot start
|
||
|
|
+ if ( exit == null )
|
||
|
|
+ {
|
||
|
|
+ return;
|
||
|
|
+ }
|
||
|
|
+ // Spigot
|
||
|
|
PlayerPortalEvent event = new PlayerPortalEvent(entityplayer.getBukkitEntity(), enter, exit, agent, cause);
|
||
|
|
event.useTravelAgent(useTravelAgent);
|
||
|
|
Bukkit.getServer().getPluginManager().callEvent(event);
|
||
|
|
--
|
||
|
|
1.9.1
|
||
|
|
|