Charter template id is stored not ordinal

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

@@ -67,18 +67,13 @@ public class ChangeGuildLeaderHandler extends AbstractClientMsgHandler {
         if (!Guild.sameGuild(sourcePlayer.getGuild(), targetPlayer.getGuild()))
             return false;
 
-
         //updateSource will generate a new promote/demote screen for sourcePlayer
         //updateTarget will sync guild info for the target and all players in range
 
-
         String targetName = null;
         boolean isMale = true;
         boolean updateTarget;
 
-        mbEnums.GuildCharterType t = mbEnums.GuildCharterType.getGuildTypeFromInt(sourcePlayer.getGuild().getCharter());
-
-
         if (!DbManager.GuildQueries.SET_GUILD_LEADER(targetPlayer.getObjectUUID(), glGuild.getObjectUUID())) {
             ChatManager.chatGuildError(sourcePlayer, "Failed to change guild leader!");
             return false;

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

@@ -21,6 +21,7 @@ import engine.net.client.msg.ClientNetMsg;
 import engine.net.client.msg.guild.ChangeRankMsg;
 import engine.net.client.msg.guild.GuildInfoMsg;
 import engine.net.client.msg.guild.GuildListMsg;
+import engine.objects.Guild;
 import engine.objects.GuildStatusController;
 import engine.objects.PlayerCharacter;
 
@@ -60,7 +61,8 @@ public class ChangeRankHandler extends AbstractClientMsgHandler {
         boolean isMale;
 
         if (msg.getPreviousRank() != msg.getNewRank()) {
-            mbEnums.GuildCharterType t = mbEnums.GuildCharterType.getGuildTypeFromInt(sourcePlayer.getGuild().getCharter());
+            Guild guild = sourcePlayer.getGuild();
+            mbEnums.GuildCharterType t = mbEnums.GuildCharterType.getGuildTypeFromInt(guild.charter.ordinal());
 
             if (targetPlayer != null) {
                 targetPlayer.setGuildTitle(msg.getNewRank());

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

@@ -96,7 +96,7 @@ public class GuildCreationFinalizeHandler extends AbstractClientMsgHandler {
 
         int leadershipType = ((msg.getICVoteFlag() << 1) | msg.getMemberVoteFlag());
 
-        newGuild = new Guild(msg.getName(), null, charterType.ordinal(),
+        newGuild = new Guild(msg.getName(), null, charterType,
                 charterType.getLeadershipType(leadershipType), msg.getGuildTag(),
                 StringUtils.truncate(msg.getMotto(), 120));
 

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

@@ -23,6 +23,7 @@ import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClientNetMsg;
 import engine.net.client.msg.ErrorPopupMsg;
 import engine.net.client.msg.guild.InviteToGuildMsg;
+import engine.objects.Guild;
 import engine.objects.GuildStatusController;
 import engine.objects.PlayerCharacter;
 
@@ -85,7 +86,8 @@ public class InviteToGuildHandler extends AbstractClientMsgHandler {
             return true;
         }
 
-        mbEnums.GuildCharterType guildCharterType = mbEnums.GuildCharterType.values()[sourcePlayer.getGuild().getCharter()];
+        Guild guild = sourcePlayer.getGuild();
+        mbEnums.GuildCharterType guildCharterType = guild.charter;
 
         if (guildCharterType == null) {
             ErrorPopupMsg.sendErrorPopup(sourcePlayer, GuildManager.NO_CHARTER_FOUND);

src/engine/net/client/msg/WhoResponseMsg.java

@@ -243,7 +243,7 @@ public class WhoResponseMsg extends ClientNetMsg {
                 writer.put((byte) 1); // Send Guild Info
                 writer.put((byte) 1); // SkipPartTwo
                 writer.putString(guild.getName());
-                writer.putInt(guild.getCharter()); // Charter Type
+                writer.putInt(guild.charter.ordinal()); // Charter Type
                 writer.putInt(GuildStatusController.getTitle(pc.getGuildStatus()));
                 writer.putString("what"); // City?, Skip if SkipPartTwo = 0x00
             } else {

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

@@ -289,7 +289,7 @@ class GuildInfoMessageType4 extends GuildInfoMessageType {
         writer.putString(nation.getName());
         writer.putInt(GuildStatusController.getRank(pc.getGuildStatus()));
         writer.putInt(GuildStatusController.getTitle(pc.getGuildStatus()));
-        writer.putInt(g.getCharter());
+        writer.putInt(g.charter.ordinal());
         writer.putString(cityName); //Shows City Name FUCK
         AbstractCharacter guildLeader;
         String guildLeaderName = "";
@@ -392,7 +392,7 @@ class GuildInfoMessageType5 extends GuildInfoMessageType {
 
             writer.putInt(GuildStatusController.getRank(pc.getGuildStatus()));    //Rank
             writer.putInt(GuildStatusController.getTitle(pc.getGuildStatus()));    //Title
-            writer.putInt(g.getCharter());
+            writer.putInt(g.charter.ordinal());
 
             if (g.getNation().equals(Guild.getErrantNation()))
                 writer.putString("Errant");

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

@@ -125,7 +125,7 @@ class GuildListMessageType1 extends GuildListMessageType {
 
     @Override
     void _serialize(ByteBufferWriter writer) {
-        mbEnums.GuildCharterType gt = mbEnums.GuildCharterType.getGuildTypeFromInt(g.getCharter());
+        mbEnums.GuildCharterType gt = g.charter;
 
         writer.putInt(1);
         writer.putInt(gt.ordinal());    //Charter Type
@@ -209,7 +209,7 @@ class GuildListMessageType2 extends GuildListMessageType {
 
         writer.putInt(2);    //PAD
         writer.putInt(pc.getLevel());
-        writer.putInt(g.getCharter());
+        writer.putInt(g.charter.ordinal());
 
         //TODO Get Guild History from the DB
         //ArrayList<GuildHistory> history = DbManager.GuildQueries.GET_GUILD_HISTORY_OF_PLAYER((int)pc.getPlayerUUID());