Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2024-11-28 05:26:29 +01:00
Code Issues Projects Releases Wiki Activity

Fix groups using two group signs

Browse Source
This commit is contained in:
Daniel Saukel 2020-10-30 17:10:31 +01:00
parent a603441bbe
commit 51a120bb67
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/de/erethon/dungeonsxl/global/GroupSign.java
View File

@ -136,11 +136,12 @@ public class GroupSign extends JoinSign {
DGroup playerGroup = (DGroup) plugin.getPlayerGroup(player); DGroup playerGroup = (DGroup) plugin.getPlayerGroup(player);
if (playerGroup != null) { if (playerGroup != null) {
if (playerGroup.getLeader().equals(player)) { if (playerGroup.getLeader().equals(player)) {
if (group != null || maxElements < playerGroup.getMembers().size()) { if (playerGroup.getGroupSign() != null || group != null || maxElements < playerGroup.getMembers().size()) {
MessageUtil.sendMessage(player, DMessage.ERROR_LEAVE_GROUP.getMessage()); MessageUtil.sendMessage(player, DMessage.ERROR_LEAVE_GROUP.getMessage());
return; return;
} else { } else {
group = playerGroup; group = playerGroup;
group.setGroupSign(this);
group.setDungeon(dungeon); group.setDungeon(dungeon);
update(); update();
return; return;
@ -165,8 +166,10 @@ public class GroupSign extends JoinSign {
if (groupName != null) { if (groupName != null) {
group = new DGroup(plugin, groupName, player, dungeon); group = new DGroup(plugin, groupName, player, dungeon);
group.setGroupSign(this);
} else { } else {
group = new DGroup(plugin, player, dungeon); group = new DGroup(plugin, player, dungeon);
group.setGroupSign(this);
} }
update(); update();

10
core/src/main/java/de/erethon/dungeonsxl/player/DGroup.java
View File

@ -43,6 +43,7 @@ import de.erethon.dungeonsxl.config.DMessage;
import de.erethon.dungeonsxl.dungeon.DDungeon; import de.erethon.dungeonsxl.dungeon.DDungeon;
import de.erethon.dungeonsxl.dungeon.DGame; import de.erethon.dungeonsxl.dungeon.DGame;
import de.erethon.dungeonsxl.dungeon.DungeonConfig; import de.erethon.dungeonsxl.dungeon.DungeonConfig;
import de.erethon.dungeonsxl.global.GroupSign;
import de.erethon.dungeonsxl.world.DGameWorld; import de.erethon.dungeonsxl.world.DGameWorld;
import de.erethon.dungeonsxl.world.DResourceWorld; import de.erethon.dungeonsxl.world.DResourceWorld;
import java.util.ArrayList; import java.util.ArrayList;
@ -69,6 +70,7 @@ public class DGroup implements PlayerGroup {
private int id; private int id;
private String name; private String name;
private GroupSign groupSign;
private Player captain; private Player captain;
private PlayerCollection players = new PlayerCollection(); private PlayerCollection players = new PlayerCollection();
private PlayerCollection invitedPlayers = new PlayerCollection(); private PlayerCollection invitedPlayers = new PlayerCollection();
@ -177,6 +179,14 @@ public class DGroup implements PlayerGroup {
this.name = name; this.name = name;
} }
public GroupSign getGroupSign() {
return groupSign;
}
public void setGroupSign(GroupSign groupSign) {
this.groupSign = groupSign;
}
@Override @Override
public Player getLeader() { public Player getLeader() {
return captain; return captain;