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

Charter template id is stored not ordinal

Browse Source
This commit is contained in:
MagicBot
2024-04-28 14:18:13 -04:00
parent 4f20cc9aba
commit 3c4d8239db
12 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/msg/WhoResponseMsg.java
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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());