CivMC/Civ
1
0
Fork 0
mirror of https://github.com/CivMC/Civ.git synced 2026-07-18 00:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13 from Falvyu/master

Browse Source 
Fixed bug where blacklisted players could join password protected groups
This commit is contained in:
Maxopoly
2020-03-29 06:39:31 +02:00
committed by GitHub
parent 131980ae41 b3d43ae9cb
commit a4f4567191
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/namelayer-paper/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/JoinGroup.java
View File

@@ -9,6 +9,7 @@ import org.bukkit.entity.Player;
import vg.civcraft.mc.namelayer.GroupManager.PlayerType;
import vg.civcraft.mc.namelayer.NameAPI;
import vg.civcraft.mc.namelayer.NameLayerPlugin;
import vg.civcraft.mc.namelayer.command.PlayerCommandMiddle;
import vg.civcraft.mc.namelayer.group.Group;
import vg.civcraft.mc.namelayer.permission.GroupPermission;
@@ -59,6 +60,11 @@ public class JoinGroup extends PlayerCommandMiddle{
p.sendMessage(ChatColor.RED + "You are already a member.");
return true;
}
if(NameLayerPlugin.getBlackList().isBlacklisted(g, uuid)) {
p.sendMessage(ChatColor.RED + "You can not join a group you have been blacklisted from");
return true;
}
g.addMember(uuid, pType);
p.sendMessage(ChatColor.GREEN + "You have successfully been added to this group.");
return true;

8
plugins/namelayer-paper/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/GUIGroupOverview.java
View File

@@ -396,11 +396,17 @@ public class GUIGroupOverview {
Group gro = ensureFreshGroup(g);
GroupPermission groupPerm = gm.getPermissionforGroup(gro);
PlayerType pType = groupPerm.getFirstWithPerm(PermissionType.getPermission("JOIN_PASSWORD"));
if (pType == null){
if (pType == null) {
p.sendMessage(ChatColor.RED + "Someone derped. This group does not have the specified permission to let you join, sorry.");
showScreen();
return;
}
if (NameLayerPlugin.getBlackList().isBlacklisted(gro, p.getUniqueId())) {
p.sendMessage(ChatColor.RED + "You can not join a group you have been blacklisted from");
showScreen();
return;
}
NameLayerPlugin.log(Level.INFO,
p.getName() + " joined with password "
+ " to group " + g.getName()