PandacubeFr/PandacraftUtils
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correction de plusieurs NullPointerException

Browse Source
This commit is contained in:
Marc Baloup 2015-06-22 20:36:44 +02:00
parent 29c68c2687
commit 4f51118a8a
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/PandacraftAuth.jar
View File

Binary file not shown.

10
src/net/mc_pandacraft/java/plugin/pandacraftutils/commands/CommandStaff.java
View File

@ -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);
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+"-----------------------------------------------");
}

1
src/net/mc_pandacraft/java/plugin/pandacraftutils/config/WorldBorderConfig.java
View File

@ -59,6 +59,7 @@ public class WorldBorderConfig extends AbstractConfig {
}
public WorldBorderConfigEntry getEntry(World world) {
if (world == null) return null;
return getEntry(world.getName());
}

2
src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/protection/NoPvpProtectManager.java
View File

@ -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())