Jona123/NPCLib
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #88 from Mooselk/master

Browse Source 
Fixed NPE
This commit is contained in:
Jitse Boonstra
2020-06-22 18:20:14 +02:00
committed by GitHub
parent b20f792573 e4dc20e3ce
commit 615da55a31
1 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/src/main/java/net/jitse/npclib/listeners/PeriodicMoveListener.java
+10 -8
View File
@@ -1,8 +1,6 @@
package net.jitse.npclib.listeners; package net.jitse.npclib.listeners;
import java.util.HashMap; import net.jitse.npclib.NPCLib;
import java.util.UUID;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@@ -11,7 +9,8 @@ import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.scheduler.BukkitTask; import org.bukkit.scheduler.BukkitTask;
import net.jitse.npclib.NPCLib; import java.util.HashMap;
import java.util.UUID;
public class PeriodicMoveListener extends HandleMoveBase implements Listener { public class PeriodicMoveListener extends HandleMoveBase implements Listener {
@@ -36,13 +35,16 @@ public class PeriodicMoveListener extends HandleMoveBase implements Listener {
} }
@EventHandler @EventHandler
public void onPlayerJoin(PlayerJoinEvent evt) { public void onPlayerJoin(PlayerJoinEvent event) {
startTask(evt.getPlayer().getUniqueId()); startTask(event.getPlayer().getUniqueId());
} }
@EventHandler @EventHandler
public void onPlayerQuit(PlayerQuitEvent evt) { public void onPlayerQuit(PlayerQuitEvent event) {
tasks.remove(evt.getPlayer().getUniqueId()).cancel(); BukkitTask task = tasks.remove(event.getPlayer().getUniqueId());
if (task != null) {
task.cancel();
}
} }
} }