MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Project cleanup pre merge.

Browse Source
This commit is contained in:
MagicBot
2023-07-15 09:23:48 -04:00
parent 134b651df8
commit 9bbdef224d
747 changed files with 99704 additions and 101200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/handlers/DismissGuildHandler.java
+5 -6
View File
@@ -54,31 +54,30 @@ public class DismissGuildHandler extends AbstractClientMsgHandler {
toDismiss = (Guild) DbManager.getObject(GameObjectType.Guild, dismissMsg.getGuildID());
if (toDismiss == null) {
ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occured. Please post details for to ensure transaction integrity");
ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occured. Please post details for to ensure transaction integrity");
return true;
}
nation = player.getGuild();
if (nation == null) {
ErrorPopupMsg.sendErrorMsg(player, "Nothing to disband, your guild is not a nation!");
ErrorPopupMsg.sendErrorMsg(player, "Nothing to disband, your guild is not a nation!");
return true;
}
if (!nation.getSubGuildList().contains(toDismiss)) {
ErrorPopupMsg.sendErrorMsg(player, "You do not have authority to dismiss this guild!");
ErrorPopupMsg.sendErrorMsg(player, "You do not have authority to dismiss this guild!");
return true;
}
if (GuildStatusController.isGuildLeader(player.getGuildStatus()) == false) {
ErrorPopupMsg.sendErrorMsg(player, "Only a guild leader can dismiss a subguild!");
ErrorPopupMsg.sendErrorMsg(player, "Only a guild leader can dismiss a subguild!");
return true;
}
// Restriction on active bane desubbing
if (Bane.getBaneByAttackerGuild(toDismiss) != null)
{
if (Bane.getBaneByAttackerGuild(toDismiss) != null) {
ErrorPopupMsg.sendErrorMsg(player, "You may not dismiss subguild with active bane!");
return true;
}