Start mobequip refactor

This commit is contained in:
2024-03-18 10:01:29 -04:00
parent 0590ae64e7
commit 61c4cb1361
56 changed files with 198 additions and 377 deletions
@@ -388,7 +388,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
case WAREHOUSE:
if (contract == null)
break;
if (!playerCharacter.getCharItemManager().doesCharOwnThisItem(contract.getObjectUUID()))
if (!playerCharacter.charItemManager.doesCharOwnThisItem(contract.getObjectUUID()))
break;
buildingCreated = placeWarehouse(playerCharacter, origin, msg);
break;
@@ -396,28 +396,28 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
case BULWARK:
if (contract == null)
break;
if (!playerCharacter.getCharItemManager().doesCharOwnThisItem(contract.getObjectUUID()))
if (!playerCharacter.charItemManager.doesCharOwnThisItem(contract.getObjectUUID()))
break;
buildingCreated = placeSiegeEquip(playerCharacter, origin, msg);
break;
case SPIRE:
if (contract == null)
break;
if (!playerCharacter.getCharItemManager().doesCharOwnThisItem(contract.getObjectUUID()))
if (!playerCharacter.charItemManager.doesCharOwnThisItem(contract.getObjectUUID()))
break;
buildingCreated = placeSpire(playerCharacter, origin, msg);
break;
case SHRINE:
if (contract == null)
break;
if (!playerCharacter.getCharItemManager().doesCharOwnThisItem(contract.getObjectUUID()))
if (!playerCharacter.charItemManager.doesCharOwnThisItem(contract.getObjectUUID()))
break;
buildingCreated = placeShrine(playerCharacter, origin, msg);
break;
case BARRACK:
if (contract == null)
break;
if (!playerCharacter.getCharItemManager().doesCharOwnThisItem(contract.getObjectUUID()))
if (!playerCharacter.charItemManager.doesCharOwnThisItem(contract.getObjectUUID()))
break;
buildingCreated = placeBarrack(playerCharacter, origin, msg);
break;
@@ -433,7 +433,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
default:
if (contract == null)
break;
if (!playerCharacter.getCharItemManager().doesCharOwnThisItem(contract.getObjectUUID()))
if (!playerCharacter.charItemManager.doesCharOwnThisItem(contract.getObjectUUID()))
break;
buildingCreated = placeSingleBuilding(playerCharacter, origin, msg);
break;
@@ -448,8 +448,8 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
// Remove the appropriate deed.
if (buildingCreated == true)
if (contract != null) {
playerCharacter.getCharItemManager().delete(contract);
playerCharacter.getCharItemManager().updateInventory();
playerCharacter.charItemManager.delete(contract);
playerCharacter.charItemManager.updateInventory();
}
// Close the window. We're done!
@@ -1033,7 +1033,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
return false;
if (player.getCharItemManager().getGoldTrading() > 0) {
if (player.charItemManager.getGoldTrading() > 0) {
ErrorPopupMsg.sendErrorPopup(player, 195);
return false;
}
@@ -1050,7 +1050,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
// We need to be able to access how much gold a character is carrying
itemMan = player.getCharItemManager();
itemMan = player.charItemManager;
if (itemMan == null)