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

Raised visibility of collection

Browse Source
This commit is contained in:
MagicBot
2024-02-04 08:02:13 -05:00
parent 250e3407fa
commit fea1c2f06a
13 changed files with 48 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/handlers/ActivateNPCMsgHandler.java
+1 -1
View File
@@ -78,7 +78,7 @@ public class ActivateNPCMsgHandler extends AbstractClientMsgHandler {
return false;
}
if (building.getBlueprint().getMaxSlots() == building.getHirelings().size())
if (building.getBlueprint().getMaxSlots() == building.hirelings.size())
return false;
Item contractItem = Item.getFromCache(msg.getContractItem());
src/engine/net/client/handlers/OrderNPCMsgHandler.java
+5 -5
View File
@@ -54,7 +54,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
return;
}
if (!building.getHirelings().containsKey(hireling))
if (!building.hirelings.containsKey(hireling))
return;
BuildingManager.removeHireling(building, hireling);
@@ -402,7 +402,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
if (building == null)
return true;
if (building.getHirelings().containsKey(npc) == false)
if (building.hirelings.containsKey(npc) == false)
return true;
@@ -421,7 +421,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
if (ManageCityAssetMsgHandler.playerCanManageNotFriends(player, building) == false)
return true;
if (building.getHirelings().containsKey(npc) == false)
if (building.hirelings.containsKey(npc) == false)
return true;
if (npc.remove() == false) {
@@ -515,7 +515,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
if (building == null)
return true;
if (!building.getHirelings().containsKey(mob))
if (!building.hirelings.containsKey(mob))
return true;
if (player.getCharItemManager().getTradingWith() != null) {
@@ -531,7 +531,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
if (BuildingManager.playerCanManage(player, building) == false)
return true;
if (building.getHirelings().containsKey(mob) == false)
if (building.hirelings.containsKey(mob) == false)
return true;
BuildingManager.removeHireling(building, mob);
src/engine/net/client/msg/ManageCityAssetsMsg.java
+5 -5
View File
@@ -229,8 +229,8 @@ public class ManageCityAssetsMsg extends ClientNetMsg {
writer.putInt(asset.getObjectUUID());
writer.putInt(0);
writer.putInt(0);
writer.putInt(asset.getHirelings().size());
for (AbstractCharacter hireling : asset.getHirelings().keySet()) {
writer.putInt(asset.hirelings.size());
for (AbstractCharacter hireling : asset.hirelings.keySet()) {
if (!hireling.getObjectType().equals(GameObjectType.NPC))
writer.putString(hireling.getName());
else {
@@ -262,9 +262,9 @@ public class ManageCityAssetsMsg extends ClientNetMsg {
for (int a = 0; a < 5; a++)
writer.putInt(0);
writer.putInt(asset.getHirelings().size());
writer.putInt(asset.hirelings.size());
for (AbstractCharacter npcHire : asset.getHirelings().keySet()) {
for (AbstractCharacter npcHire : asset.hirelings.keySet()) {
writer.putInt(npcHire.getObjectType().ordinal());
writer.putInt(npcHire.getObjectUUID());
if (npcHire.getObjectType() == GameObjectType.NPC)
@@ -669,7 +669,7 @@ public class ManageCityAssetsMsg extends ClientNetMsg {
}
ConcurrentHashMap<AbstractCharacter, Integer> npcList = building.getHirelings();
ConcurrentHashMap<AbstractCharacter, Integer> npcList = building.hirelings;
writer.putInt(npcList.size());
if (npcList.size() > 0) {
for (AbstractCharacter npcHire : npcList.keySet()) {