Class requirements refactored to enumset.

src/engine/net/client/handlers/ChangeGuildLeaderHandler.java

@@ -76,7 +76,7 @@ public class ChangeGuildLeaderHandler extends AbstractClientMsgHandler {
         boolean isMale = true;
         boolean updateTarget;
 
-        Enum.GuildType t = Enum.GuildType.getGuildTypeFromInt(sourcePlayer.getGuild().getCharter());
+        Enum.GuildCharterType t = Enum.GuildCharterType.getGuildTypeFromInt(sourcePlayer.getGuild().getCharter());
 
 
         if (!DbManager.GuildQueries.SET_GUILD_LEADER(targetPlayer.getObjectUUID(), glGuild.getObjectUUID())) {

src/engine/net/client/handlers/ChangeRankHandler.java

@@ -60,7 +60,7 @@ public class ChangeRankHandler extends AbstractClientMsgHandler {
         boolean isMale;
 
         if (msg.getPreviousRank() != msg.getNewRank()) {
-            Enum.GuildType t = Enum.GuildType.getGuildTypeFromInt(sourcePlayer.getGuild().getCharter());
+            Enum.GuildCharterType t = Enum.GuildCharterType.getGuildTypeFromInt(sourcePlayer.getGuild().getCharter());
 
             if (targetPlayer != null) {
                 targetPlayer.setGuildTitle(msg.getNewRank());

src/engine/net/client/handlers/GuildCreationFinalizeHandler.java

@@ -43,7 +43,7 @@ public class GuildCreationFinalizeHandler extends AbstractClientMsgHandler {
 
         PlayerCharacter player;
         GuildCreationFinalizeMsg msg;
-        Enum.GuildType charterType;
+        Enum.GuildCharterType charterType;
         Guild newGuild;
         Guild playerGuild;
         ItemBase itemBase;
@@ -78,7 +78,7 @@ public class GuildCreationFinalizeHandler extends AbstractClientMsgHandler {
             return true;
         }
 
-        charterType = Enum.GuildType.getGuildTypeFromCharter(itemBase);
+        charterType = Enum.GuildCharterType.getGuildTypeFromCharter(itemBase);
 
         if (charterType == null) {
             ErrorPopupMsg.sendErrorPopup(player, GuildManager.NO_CHARTER_FOUND);

src/engine/net/client/handlers/InviteToGuildHandler.java

@@ -84,9 +84,9 @@ public class InviteToGuildHandler extends AbstractClientMsgHandler {
             return true;
         }
 
-        Enum.GuildType guildType = Enum.GuildType.values()[sourcePlayer.getGuild().getCharter()];
+        Enum.GuildCharterType guildCharterType = Enum.GuildCharterType.values()[sourcePlayer.getGuild().getCharter()];
 
-        if (guildType == null) {
+        if (guildCharterType == null) {
             ErrorPopupMsg.sendErrorPopup(sourcePlayer, GuildManager.NO_CHARTER_FOUND);
             return true;
         }

src/engine/net/client/msg/guild/GuildListMsg.java

@@ -125,7 +125,7 @@ class GuildListMessageType1 extends GuildListMessageType {
 
     @Override
     void _serialize(ByteBufferWriter writer) {
-        Enum.GuildType gt = Enum.GuildType.getGuildTypeFromInt(g.getCharter());
+        Enum.GuildCharterType gt = Enum.GuildCharterType.getGuildTypeFromInt(g.getCharter());
 
         writer.putInt(1);
         writer.putInt(gt.ordinal());    //Charter Type