fix: Prevent infinite purchase from shopkeeper (#56)

* Switch order of origin and target storage so that selling stores the item correctly * Switch to playerResourceStore instead of storage building
Terasology · Apr 12, 2020 · 074ea0f · 074ea0f
1 parent 97c8395
commit 074ea0f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/java/org/terasology/metalrenegades/economy/systems/MarketManagementSystem.java b/src/main/java/org/terasology/metalrenegades/economy/systems/MarketManagementSystem.java
@@ -184,7 +184,7 @@ private MarketItem buy(MarketItem item) {
         if (!walletSystem.isValidTransaction(-1 * item.cost)) {
             logger.warn("Insufficient funds");
             return item;
-        } else {
+        } else if (item.quantity > 0) {
 
             if (!createItemOrBlock(item.name)) {
                 logger.warn("Failed to create entity");
@@ -206,10 +206,10 @@ private MarketItem buy(MarketItem item) {
                         handler.availableResourceAmount(component, item.name));
 
                 item.quantity--;
+                localPlayer.getCharacterEntity().send(new UpdateWalletEvent(-1 * item.cost));
                 break;
             }
 
-            localPlayer.getCharacterEntity().send(new UpdateWalletEvent(-1 * item.cost));
         }
 
         return item;
@@ -228,12 +228,12 @@ private MarketItem sell(MarketItem item) {
             }
 
             SettlementRefComponent settlementRefComponent = bldg.getComponent(SettlementRefComponent.class);
-            bldg.send(new ResourceStoreEvent(item.name, 1, settlementRefComponent.settlement.getComponent(MarketComponent.class).market));
+            playerResourceStore.send(new ResourceStoreEvent(item.name, 1, settlementRefComponent.settlement.getComponent(MarketComponent.class).market));
             item.quantity--;
+            localPlayer.getCharacterEntity().send(new UpdateWalletEvent(item.cost));
             break;
         }
 
-        localPlayer.getCharacterEntity().send(new UpdateWalletEvent(item.cost));
         return item;
     }