diff --git a/lib/PandacraftAuth.jar b/lib/PandacraftAuth.jar index 14b14d3..7231142 100644 Binary files a/lib/PandacraftAuth.jar and b/lib/PandacraftAuth.jar differ diff --git a/src/net/mc_pandacraft/java/plugin/pandacraftutils/commands/CommandStaff.java b/src/net/mc_pandacraft/java/plugin/pandacraftutils/commands/CommandStaff.java index f7fab8a..231ec6a 100644 --- a/src/net/mc_pandacraft/java/plugin/pandacraftutils/commands/CommandStaff.java +++ b/src/net/mc_pandacraft/java/plugin/pandacraftutils/commands/CommandStaff.java @@ -152,11 +152,17 @@ public class CommandStaff extends AbstractCommandExecutor { } else { // le joueur n'est pas en ligne - ((Player)sender).teleport(wp.getLocation()); - sender.sendMessage(ChatColor.GREEN+"-----------------------------------------------"); displayTicket(sender, wp, true); - sender.sendMessage(ChatColor.GREEN+"Vous avez été téléporté vers l'endroit concerné par la demande du joueur"); + + if (wp.getLocation().getWorld() == null) { + sender.sendMessage(ChatColor.GREEN+"Le monde vers lequel vous deviez vous téléporter est introuvable ou invalide"); + } + else { + ((Player)sender).teleport(wp.getLocation()); + sender.sendMessage(ChatColor.GREEN+"Vous avez été téléporté vers l'endroit concerné par la demande du joueur"); + } + sender.sendMessage(ChatColor.GREEN+"-----------------------------------------------"); } diff --git a/src/net/mc_pandacraft/java/plugin/pandacraftutils/config/WorldBorderConfig.java b/src/net/mc_pandacraft/java/plugin/pandacraftutils/config/WorldBorderConfig.java index c5a33c2..f653931 100644 --- a/src/net/mc_pandacraft/java/plugin/pandacraftutils/config/WorldBorderConfig.java +++ b/src/net/mc_pandacraft/java/plugin/pandacraftutils/config/WorldBorderConfig.java @@ -59,6 +59,7 @@ public class WorldBorderConfig extends AbstractConfig { } public WorldBorderConfigEntry getEntry(World world) { + if (world == null) return null; return getEntry(world.getName()); } diff --git a/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/protection/NoPvpProtectManager.java b/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/protection/NoPvpProtectManager.java index 79f156a..da2e5e0 100644 --- a/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/protection/NoPvpProtectManager.java +++ b/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/protection/NoPvpProtectManager.java @@ -250,7 +250,7 @@ public class NoPvpProtectManager { for (Player pl : pls) { // on ignore ceux en créatif - if (pl == null || !pl.isOnline() || pl.getGameMode() == GameMode.CREATIVE) + if (pl == null || !pl.isOnline() || OnlinePlayerManager.get(pl) == null || pl.getGameMode() == GameMode.CREATIVE) continue; if (OnlinePlayerManager.get(pl).isVanished())