Renamed class to not conflict with the java.lang version.
This commit is contained in:
@@ -9,8 +9,8 @@
|
||||
|
||||
package engine.objects;
|
||||
|
||||
import engine.Enum;
|
||||
import engine.Enum.*;
|
||||
import engine.mbEnums;
|
||||
import engine.mbEnums.*;
|
||||
import engine.db.archive.DataWarehouse;
|
||||
import engine.db.archive.GuildRecord;
|
||||
import engine.db.handlers.dbGuildHandler;
|
||||
@@ -326,7 +326,7 @@ public class Guild extends AbstractWorldObject {
|
||||
|
||||
if (objectUUID == 0)
|
||||
return Guild.getErrantGuild();
|
||||
Guild guild = (Guild) DbManager.getFromCache(Enum.GameObjectType.Guild, objectUUID);
|
||||
Guild guild = (Guild) DbManager.getFromCache(mbEnums.GameObjectType.Guild, objectUUID);
|
||||
if (guild != null)
|
||||
return guild;
|
||||
|
||||
@@ -346,7 +346,7 @@ public class Guild extends AbstractWorldObject {
|
||||
|
||||
if (Guild.sameGuild(player.getGuild(), toUpdate)) {
|
||||
Dispatch dispatch = Dispatch.borrow(player, ucam);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
|
||||
}
|
||||
|
||||
|
||||
@@ -356,7 +356,7 @@ public class Guild extends AbstractWorldObject {
|
||||
public static void UpdateClientAlliancesForPlayer(PlayerCharacter toUpdate) {
|
||||
UpdateClientAlliancesMsg ucam = new UpdateClientAlliancesMsg(toUpdate.getGuild());
|
||||
Dispatch dispatch = Dispatch.borrow(toUpdate, ucam);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
|
||||
|
||||
|
||||
}
|
||||
@@ -806,8 +806,8 @@ public class Guild extends AbstractWorldObject {
|
||||
|
||||
this.setHash();
|
||||
|
||||
if (DataWarehouse.recordExists(Enum.DataRecordType.GUILD, this.getObjectUUID()) == false) {
|
||||
GuildRecord guildRecord = GuildRecord.borrow(this, Enum.RecordEventType.CREATE);
|
||||
if (DataWarehouse.recordExists(mbEnums.DataRecordType.GUILD, this.getObjectUUID()) == false) {
|
||||
GuildRecord guildRecord = GuildRecord.borrow(this, mbEnums.RecordEventType.CREATE);
|
||||
DataWarehouse.pushToWarehouse(guildRecord);
|
||||
}
|
||||
|
||||
@@ -962,7 +962,7 @@ public class Guild extends AbstractWorldObject {
|
||||
public void setHash() {
|
||||
this.hash = DataWarehouse.hasher.encrypt(this.getObjectUUID());
|
||||
|
||||
DataWarehouse.writeHash(Enum.DataRecordType.GUILD, this.getObjectUUID());
|
||||
DataWarehouse.writeHash(mbEnums.DataRecordType.GUILD, this.getObjectUUID());
|
||||
}
|
||||
|
||||
public GuildCharterType getGuildType() {
|
||||
@@ -996,7 +996,7 @@ public class Guild extends AbstractWorldObject {
|
||||
if (!Guild.sameGuild(player.getGuild(), this)) {
|
||||
msg.setMsgType(AllianceChangeMsg.ERROR_NOT_SAME_GUILD);
|
||||
dispatch = Dispatch.borrow(player, msg);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1004,7 +1004,7 @@ public class Guild extends AbstractWorldObject {
|
||||
if (!GuildStatusController.isInnerCouncil(player.getGuildStatus()) && !GuildStatusController.isGuildLeader(player.getGuildStatus())) {
|
||||
msg.setMsgType(AllianceChangeMsg.ERROR_NOT_AUTHORIZED);
|
||||
dispatch = Dispatch.borrow(player, msg);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1012,7 +1012,7 @@ public class Guild extends AbstractWorldObject {
|
||||
if (!GuildStatusController.isFullMember(player.getGuildStatus())) {
|
||||
msg.setMsgType(AllianceChangeMsg.ERROR_NOT_AUTHORIZED);
|
||||
dispatch = Dispatch.borrow(player, msg);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -1030,7 +1030,7 @@ public class Guild extends AbstractWorldObject {
|
||||
if (recommendList.size() == 10) {
|
||||
msg.setMsgType(AllianceChangeMsg.ERROR_TOO_MANY);
|
||||
dispatch = Dispatch.borrow(player, msg);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1038,7 +1038,7 @@ public class Guild extends AbstractWorldObject {
|
||||
ErrorPopupMsg.sendErrorMsg(player, "This guild is already recommonded!");
|
||||
msg.setMsgType((byte) 15);
|
||||
dispatch = Dispatch.borrow(player, msg);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1061,7 +1061,7 @@ public class Guild extends AbstractWorldObject {
|
||||
if (recommendList.size() == 10) {
|
||||
msg.setMsgType(AllianceChangeMsg.ERROR_TOO_MANY);
|
||||
dispatch = Dispatch.borrow(player, msg);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1069,7 +1069,7 @@ public class Guild extends AbstractWorldObject {
|
||||
ErrorPopupMsg.sendErrorMsg(player, "This guild is already recommonded!");
|
||||
msg.setMsgType((byte) 15);
|
||||
dispatch = Dispatch.borrow(player, msg);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1091,7 +1091,7 @@ public class Guild extends AbstractWorldObject {
|
||||
if (allyList.size() == 10) {
|
||||
msg.setMsgType(AllianceChangeMsg.ERROR_TOO_MANY);
|
||||
dispatch = Dispatch.borrow(player, msg);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1099,7 +1099,7 @@ public class Guild extends AbstractWorldObject {
|
||||
ErrorPopupMsg.sendErrorMsg(player, "This guild is already an Ally!");
|
||||
msg.setMsgType((byte) 15);
|
||||
dispatch = Dispatch.borrow(player, msg);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1108,7 +1108,7 @@ public class Guild extends AbstractWorldObject {
|
||||
Logger.error(this.getObjectUUID() + " Could not find alliance Guild");
|
||||
msg.setMsgType((byte) 15);
|
||||
dispatch = Dispatch.borrow(player, msg);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1118,7 +1118,7 @@ public class Guild extends AbstractWorldObject {
|
||||
Logger.error(this.getObjectUUID() + " failed to update alliance Database");
|
||||
msg.setMsgType((byte) 15);
|
||||
dispatch = Dispatch.borrow(player, msg);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
|
||||
return false;
|
||||
|
||||
}
|
||||
@@ -1135,7 +1135,7 @@ public class Guild extends AbstractWorldObject {
|
||||
if (enemyList.size() == 10) {
|
||||
msg.setMsgType(AllianceChangeMsg.ERROR_TOO_MANY);
|
||||
dispatch = Dispatch.borrow(player, msg);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1143,7 +1143,7 @@ public class Guild extends AbstractWorldObject {
|
||||
ErrorPopupMsg.sendErrorMsg(player, "This guild is already an Enemy!");
|
||||
msg.setMsgType((byte) 15);
|
||||
dispatch = Dispatch.borrow(player, msg);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1152,7 +1152,7 @@ public class Guild extends AbstractWorldObject {
|
||||
Logger.error(this.getObjectUUID() + " Could not find alliance Guild");
|
||||
msg.setMsgType((byte) 15);
|
||||
dispatch = Dispatch.borrow(player, msg);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1162,7 +1162,7 @@ public class Guild extends AbstractWorldObject {
|
||||
Logger.error(this.getObjectUUID() + " failed to update alliance Database");
|
||||
msg.setMsgType((byte) 15);
|
||||
dispatch = Dispatch.borrow(player, msg);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
|
||||
return false;
|
||||
|
||||
}
|
||||
@@ -1180,7 +1180,7 @@ public class Guild extends AbstractWorldObject {
|
||||
// once here everything passed, send successMsg;
|
||||
msg.setMsgType(AllianceChangeMsg.INFO_SUCCESS);
|
||||
dispatch = Dispatch.borrow(player, msg);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
|
||||
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user