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

NPC buildings dont run out of gold space on buildings

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-04-21 16:01:01 -05:00
parent a902ff720a
commit 7a7559dee5
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/ClientMessagePump.java
+2 -2
View File
@@ -1519,7 +1519,7 @@ public class ClientMessagePump implements NetMsgHandler {
int buildingDeposit = cost;
if (b != null && (b.getStrongboxValue() + buildingDeposit) > b.getMaxGold()) {
if (b != null && (b.getStrongboxValue() + buildingDeposit) > b.getMaxGold() && !b.isOwnerIsNPC()) {
ErrorPopupMsg.sendErrorPopup(sourcePlayer, 206);
return;
}
@@ -1575,7 +1575,7 @@ public class ClientMessagePump implements NetMsgHandler {
b = null;
int buildingDeposit = cost;
if (b != null && (b.getStrongboxValue() + buildingDeposit) > b.getMaxGold()) {
if (b != null && (b.getStrongboxValue() + buildingDeposit) > b.getMaxGold() && !b.isOwnerIsNPC()) {
ErrorPopupMsg.sendErrorPopup(sourcePlayer, 206);
return;
}
src/engine/objects/CharacterItemManager.java
+2 -2
View File
@@ -1399,7 +1399,7 @@ public class CharacterItemManager {
if (buildingCity != null) {
buildingCity.transactionLock.writeLock().lock();
try {
if (!vendorBuilding.transferGold(buildingDeposit, true)) {
if (!vendorBuilding.isOwnerIsNPC() && !vendorBuilding.transferGold(buildingDeposit, true)) {
return false;
}
} catch (Exception e) {
@@ -1408,7 +1408,7 @@ public class CharacterItemManager {
} finally {
buildingCity.transactionLock.writeLock().unlock();
}
} else if (!vendorBuilding.transferGold(buildingDeposit, true)) {
} else if (!vendorBuilding.isOwnerIsNPC() && !vendorBuilding.transferGold(buildingDeposit, true)) {
return false;
}
return true;