BadBird/BattleBane
1
0
Fork 0
forked from MagicBane/Server
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Renamed class to not conflict with the java.lang version.

Browse Source
This commit is contained in:
MagicBot
2024-04-05 07:59:44 -04:00
parent dd84615ca1
commit c1ee6f5b52
388 changed files with 1807 additions and 1779 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/Account.java
+10 -10
View File
@@ -9,13 +9,13 @@
package engine.objects;
import engine.Enum;
import engine.Enum.DispatchChannel;
import engine.Enum.ItemContainerType;
import engine.gameManager.ConfigManager;
import engine.gameManager.DbManager;
import engine.gameManager.NPCManager;
import engine.gameManager.SessionManager;
import engine.mbEnums;
import engine.mbEnums.DispatchChannel;
import engine.mbEnums.ItemContainerType;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.ClientConnection;
@@ -42,7 +42,7 @@ public class Account extends AbstractGameObject {
public HashMap<Integer, PlayerCharacter> characterMap = new HashMap<>();
public Item vaultGold = null;
public long lastPasswordCheck = 0;
public Enum.AccountStatus status;
public mbEnums.AccountStatus status;
private String passwd;
private int lastCharIDUsed;
private String salt;
@@ -58,7 +58,7 @@ public class Account extends AbstractGameObject {
this.lastCharIDUsed = resultSet.getInt("acct_lastCharUID");
this.salt = resultSet.getString("acct_salt");
this.discordAccount = resultSet.getString("discordAccount");
this.status = Enum.AccountStatus.valueOf(resultSet.getString("status"));
this.status = mbEnums.AccountStatus.valueOf(resultSet.getString("status"));
}
public ArrayList<Item> getVault() {
@@ -161,7 +161,7 @@ public class Account extends AbstractGameObject {
try {
if (ConfigManager.serverType.equals(Enum.ServerType.LOGINSERVER)) {
if (ConfigManager.serverType.equals(mbEnums.ServerType.LOGINSERVER)) {
ArrayList<PlayerCharacter> playerList = DbManager.PlayerCharacterQueries.GET_CHARACTERS_FOR_ACCOUNT(this.getObjectUUID());
for (PlayerCharacter player : playerList) {
@@ -172,11 +172,11 @@ public class Account extends AbstractGameObject {
playerList.clear();
}
if (ConfigManager.serverType.equals(Enum.ServerType.WORLDSERVER)) {
if (ConfigManager.serverType.equals(mbEnums.ServerType.WORLDSERVER)) {
this.vault = DbManager.ItemQueries.GET_ITEMS_FOR_ACCOUNT(this.getObjectUUID());
for (Item item : this.vault) {
if (item.template.item_type.equals(Enum.ItemType.GOLD)) {
if (item.template.item_type.equals(mbEnums.ItemType.GOLD)) {
this.vaultGold = item;
}
}
@@ -219,7 +219,7 @@ public class Account extends AbstractGameObject {
if (!item.validForInventory(origin, player, player.charItemManager))
return;
if (item.containerType == Enum.ItemContainerType.INVENTORY && player.charItemManager.isVaultOpen()) {
if (item.containerType == mbEnums.ItemContainerType.INVENTORY && player.charItemManager.isVaultOpen()) {
if (!player.charItemManager.hasRoomVault(item.template.item_wt)) {
ItemToVaultMsgHandler.forceTransferFromVaultToInventory(msg, origin, "There is no room in your vault.");
return;
@@ -265,7 +265,7 @@ public class Account extends AbstractGameObject {
if (!item.validForVault(origin, player, itemManager))
return;
if (item.containerType == Enum.ItemContainerType.VAULT && itemManager.isVaultOpen()) {
if (item.containerType == mbEnums.ItemContainerType.VAULT && itemManager.isVaultOpen()) {
if (!itemManager.hasRoomInventory(item.template.item_wt)) {
ItemFromVaultMsgHandler.forceTransferFromInventoryToVault(msg, origin, "There is no room in your inventory.");
return;