also send update if not in a world

weaondara · Dec 6, 2015 · 9412588 · 9412588
1 parent cb1253a
commit 9412588
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/main/java/net/alpenblock/bungeeperms/platform/bukkit/BukkitEventListener.java b/src/main/java/net/alpenblock/bungeeperms/platform/bukkit/BukkitEventListener.java
@@ -104,6 +104,8 @@ public void onLogin(PlayerLoginEvent e)
             u = pm().createTempUser(playername, uuid);
             pm().getBackEnd().saveUser(u, true);
         }
+
+        BukkitPlugin.getInstance().getNotifier().sendWorldUpdate(e.getPlayer());
 
         //inject permissible
         Permissible permissible = new Permissible(e.getPlayer(), u);

diff --git a/src/main/java/net/alpenblock/bungeeperms/platform/bukkit/BukkitNotifier.java b/src/main/java/net/alpenblock/bungeeperms/platform/bukkit/BukkitNotifier.java
@@ -76,7 +76,7 @@ public void reloadGroup(Group g, String origin)
 
         sendPMAll("reloadGroup;" + g.getName(), origin);
     }
-    
+
     @Override
     public void reloadUsers(String origin)
     {
@@ -121,7 +121,7 @@ private void sendPM(String player, String msg, String origin)
         {
             return;
         }
-        
+
         Player p = Bukkit.getPlayer(player);
         if (p != null)
         {
@@ -136,7 +136,7 @@ private void sendPM(UUID player, String msg, String origin)
         {
             return;
         }
-        
+
         Player p = Bukkit.getPlayer(player);
         if (p != null)
         {
@@ -151,7 +151,7 @@ private void sendPMAll(String msg, String origin)
         {
             return;
         }
-        
+
         Player p = Bukkit.getOnlinePlayers().iterator().hasNext() ? Bukkit.getOnlinePlayers().iterator().next() : null;
         if (p != null)
         {
@@ -167,6 +167,7 @@ public void sendWorldUpdate(Player p)
             return;
         }
 
-        p.sendPluginMessage(BukkitPlugin.getInstance(), BungeePerms.CHANNEL, ("playerworldupdate;" + p.getName() + ";" + p.getWorld().getName()).getBytes());
+        String world = p.getWorld() == null ? "" : p.getWorld().getName();
+        p.sendPluginMessage(BukkitPlugin.getInstance(), BungeePerms.CHANNEL, ("playerworldupdate;" + p.getName() + ";" + world).getBytes());
     }
 }