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

GuildType lookup work

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-04-28 12:40:53 -05:00
parent 1876e09b48
commit 72172b9f05
4 changed files with 5 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/mbEnums.java
-75
View File
@@ -2557,81 +2557,6 @@ public class mbEnums {
GuildCharterType.templateLookup.put(guildCharterType.templateID, guildCharterType);
}
public static GuildCharterType getGuildTypeFromCharter(Item charter) {
GuildCharterType charterType;
// Must be a valid charter object
if (charter.template.item_type.equals(ItemType.CHARTER) == false)
return GuildCharterType.NONE; //No guild Type
switch (charter.template.template_id) {
case 559:
charterType = GuildCharterType.CATHEDRAL;
break;
case 560:
charterType = GuildCharterType.MILITARY;
break;
case 561:
charterType = GuildCharterType.TEMPLE;
break;
case 562:
charterType = GuildCharterType.BARBARIAN;
break;
case 563:
charterType = GuildCharterType.RANGER;
break;
case 564:
charterType = GuildCharterType.AMAZON;
break;
case 565:
charterType = GuildCharterType.NOBLE;
break;
case 566:
charterType = GuildCharterType.WIZARD;
break;
case 567:
charterType = GuildCharterType.MERCENARY;
break;
case 568:
charterType = GuildCharterType.THIEVES;
break;
case 569:
charterType = GuildCharterType.DWARF;
break;
case 570:
charterType = GuildCharterType.HIGHCOURT;
break;
case 571:
charterType = GuildCharterType.VIRAKT;
break;
case 572:
charterType = GuildCharterType.SCOURGE;
break;
case 573:
charterType = GuildCharterType.KHREE;
break;
case 574:
charterType = GuildCharterType.CENTAUR;
break;
case 575:
charterType = GuildCharterType.UNHOLY;
break;
case 576:
charterType = GuildCharterType.PIRATE;
break;
case 577:
charterType = GuildCharterType.BRIALIA;
break;
default:
charterType = GuildCharterType.HERALD;
}
return charterType;
}
public static GuildCharterType getGuildTypeFromInt(int i) {
return GuildCharterType.values()[i];
src/engine/net/client/handlers/GuildCreationFinalizeHandler.java
+1 -1
View File
@@ -75,7 +75,7 @@ public class GuildCreationFinalizeHandler extends AbstractClientMsgHandler {
return true;
}
charterType = mbEnums.GuildCharterType.getGuildTypeFromCharter(charter);
charterType = mbEnums.GuildCharterType.templateLookup.get(charter.templateID);
if (charterType == null) {
ErrorPopupMsg.sendErrorPopup(player, GuildManager.NO_CHARTER_FOUND);
src/engine/objects/Guild.java
+1 -1
View File
@@ -968,7 +968,7 @@ public class Guild extends AbstractWorldObject {
public GuildCharterType getGuildType() {
try {
return GuildCharterType.values()[this.charter];
return GuildCharterType.templateLookup.get(this.charter);//GuildCharterType.values()[this.charter];
} catch (Exception e) {
Logger.error(e);
return GuildCharterType.NONE;
src/engine/server/world/WorldServer.java
+3
View File
@@ -376,6 +376,9 @@ public class WorldServer {
Logger.info("Loading Minion Bases.");
MinionType.InitializeMinions();
Logger.info("Loading Charter Types.");
mbEnums.GuildCharterType.init();
Logger.info("Loading Pirate Names.");
NPCManager.loadAllPirateNames();