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

Initial warehouse refactor

Browse Source
This commit is contained in:
MagicBot
2024-03-15 10:01:22 -04:00
parent 92f53b00b8
commit 97fa583f65
15 changed files with 268 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/BuildingManager.java
+8 -8
View File
@@ -27,6 +27,7 @@ import org.pmw.tinylog.Logger;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ThreadLocalRandom;
@@ -225,24 +226,23 @@ public enum BuildingManager {
if (warehouse == null)
return false;
for (ItemBase resourceBase : ItemBase.getResourceList()) {
for (Enum.ResourceType resourceType : EnumSet.allOf(Enum.ResourceType.class)) {
template = ItemTemplate.itemTemplates.get(resourceBase.getUUID());
if (!player.getCharItemManager().hasRoomInventory(template.item_wt)) {
if (!player.getCharItemManager().hasRoomInventory(resourceType.template.item_wt)) {
ChatManager.chatSystemInfo(player, "You can not carry any more of that item.");
return false;
}
if (warehouse.resources.get(resourceBase) == null)
if (warehouse.resources.get(resourceType) == null)
continue;
int resourceAmount = warehouse.resources.get(resourceBase);
int resourceAmount = warehouse.resources.get(resourceType);
if (resourceAmount <= 0)
continue;
if (Warehouse.loot(warehouse, player, resourceBase, resourceAmount, true)) {
ChatManager.chatInfoInfo(player, "You have looted " + resourceAmount + ' ' + template.item_base_name);
if (Warehouse.loot(warehouse, player, resourceType, resourceAmount, true)) {
ChatManager.chatInfoInfo(player, "You have looted " + resourceAmount + ' ' + resourceType.name());
}
}