Merge branch 'master' of github.com:CitizensDev/Citizens2

This commit is contained in:
fullwall 2015-06-06 12:24:35 +08:00
commit 0af9ab304a

View File

@ -110,7 +110,7 @@ public class HumanController extends AbstractEntityController {
Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
@Override
public void run() {
if (!getBukkitEntity().isValid())
if (getBukkitEntity() == null || !getBukkitEntity().isValid())
return;
boolean removeFromPlayerList = Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean();
NMS.addOrRemoveFromPlayerList(getBukkitEntity(),