Upstream
/
PhantomSMP
mirror of https://github.com/chuushi/PhantomSMP.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Trigger warning when player leave event fires without join event being called 

Join event sets up the phantom list for specific player(s).
This commit is contained in:
Simon Chuu 2019-05-29 02:28:03 -04:00
parent 25759faa3f
commit eeeac813e7
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/simonorj/mc/phantomsmp/PhantomListener.java
View File

@ -132,7 +132,14 @@ public class PhantomListener implements Listener {
public void onPlayerLeave(PlayerQuitEvent e) {
Player p = e.getPlayer();
for (Phantom phantom : playerPhantomMap.get(p)) {
Set<Phantom> phantoms = playerPhantomMap.get(p);
if (phantoms == null) {
plugin.getLogger().warning("Phantom list for '" + p.getName() + "' was not initiated! Was there an error during login?");
return;
}
for (Phantom phantom : phantoms) {
if (phantom.getTarget() == p) {
phantom.setTarget(null);
phantomPlayerMap.remove(phantom);
@ -173,7 +180,6 @@ public class PhantomListener implements Listener {
targeting((Phantom) e.getEntity(), (Player) e.getTarget(), e);
}
// Check phantom in loaded chunks
@EventHandler
public void onPhantomInLoadedChunk(ChunkLoadEvent e) {
if (e.getWorld().getEnvironment() != World.Environment.NORMAL)
@ -184,7 +190,6 @@ public class PhantomListener implements Listener {
targeting((Phantom) ent, null, null);
}
// Untrack phantoms in unloaded chunks
@EventHandler
public void onPhantomInUnloadedChunk(ChunkUnloadEvent e) {
if (e.getWorld().getEnvironment() != World.Environment.NORMAL)