From 1f827c35b806cd0b7dced4ba8c1b8a304a1b570b Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sun, 11 May 2014 11:28:57 +0100 Subject: [PATCH] Correct // Spigot comment --- ...n-t-fire-PlayerPortalEvent-when-we-don-t-have-a-ta.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CraftBukkit-Patches/0146-Don-t-fire-PlayerPortalEvent-when-we-don-t-have-a-ta.patch b/CraftBukkit-Patches/0146-Don-t-fire-PlayerPortalEvent-when-we-don-t-have-a-ta.patch index 96417a82af..0546e6825a 100644 --- a/CraftBukkit-Patches/0146-Don-t-fire-PlayerPortalEvent-when-we-don-t-have-a-ta.patch +++ b/CraftBukkit-Patches/0146-Don-t-fire-PlayerPortalEvent-when-we-don-t-have-a-ta.patch @@ -1,11 +1,11 @@ -From 9bb3098ad4fb9a1bcdf99d80aeaf3b8d32971703 Mon Sep 17 00:00:00 2001 +From 2e92cd9a12cc8aacc66f1456420cf90cb09dcf03 Mon Sep 17 00:00:00 2001 From: Thinkofdeath 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 +index a4a59ee..a033f07 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 { @@ -17,7 +17,7 @@ index a4a59ee..355e589 100644 + { + return; + } -+ // Spigot ++ // Spigot end PlayerPortalEvent event = new PlayerPortalEvent(entityplayer.getBukkitEntity(), enter, exit, agent, cause); event.useTravelAgent(useTravelAgent); Bukkit.getServer().getPluginManager().callEvent(event);