Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-23 11:06:29 +01:00
Code Issues Projects Releases Wiki Activity

Don't fire PlayerPortalEvent when we don't have a target

Browse Source
This commit is contained in:
Thinkofdeath 2014-05-11 11:25:42 +01:00
parent e3f1d2cb31
commit a0fba09ac1
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
CraftBukkit-Patches/0146-Don-t-fire-PlayerPortalEvent-when-we-don-t-have-a-ta.patch Normal file
View File

@ -0,0 +1,26 @@
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