Skip to content
This repository was archived by the owner on Jun 7, 2022. It is now read-only.

Commit 5cc0664

Browse files
author
Tarek
committed
fixed joinpower bug
1 parent f666ccf commit 5cc0664

File tree

1 file changed

+18
-5
lines changed
  • cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/listener/bukkit

1 file changed

+18
-5
lines changed

cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/listener/bukkit/BukkitListener.java

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import de.dytanic.cloudnet.bridge.internal.util.ReflectionUtil;
1212
import de.dytanic.cloudnet.lib.player.CloudPlayer;
1313
import de.dytanic.cloudnet.lib.player.permission.GroupEntityData;
14+
import de.dytanic.cloudnet.lib.player.permission.PermissionGroup;
1415
import de.dytanic.cloudnet.lib.server.ServerConfig;
1516
import de.dytanic.cloudnet.lib.server.ServerGroupMode;
1617
import de.dytanic.cloudnet.lib.utility.document.Document;
@@ -124,14 +125,26 @@ public void handleFirst(PlayerLoginEvent event)
124125
{
125126
CloudPlayer cloudPlayer = CloudServer.getInstance().getCloudPlayers().get(event.getPlayer().getUniqueId());
126127
int joinPower = CloudAPI.getInstance().getServerGroupData(CloudAPI.getInstance().getGroup()).getJoinPower();
128+
127129
boolean acceptLogin = false;
128-
for (GroupEntityData entityData : cloudPlayer.getPermissionEntity().getGroups())
130+
131+
if (CloudAPI.getInstance().getPermissionPool() != null)
129132
{
130-
if (CloudAPI.getInstance().getPermissionGroup(entityData.getGroup()).getJoinPower() >= joinPower)
131-
acceptLogin = true;
133+
for (GroupEntityData entityData : cloudPlayer.getPermissionEntity().getGroups())
134+
{
135+
PermissionGroup permissionGroup = CloudAPI.getInstance().getPermissionGroup(entityData.getGroup());
132136

133-
if (event.getPlayer().hasPermission("cloudnet.joinpower." + CloudAPI.getInstance().getPermissionGroup(entityData.getGroup()).getJoinPower()))
134-
acceptLogin = true;
137+
if (permissionGroup != null)
138+
{
139+
if (permissionGroup.getJoinPower() >= joinPower)
140+
acceptLogin = true;
141+
}
142+
}
143+
}
144+
145+
if (event.getPlayer().hasPermission("cloudnet.joinpower." + joinPower))
146+
{
147+
acceptLogin = true;
135148
}
136149

137150
if (!acceptLogin)

0 commit comments

Comments
 (0)