Changeset 0e84f0aa43b80052e158e2c190490d811bd9395b

Timestamp:

06/28/08 13:39:31 (3 months ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

Christopher Jung <bktheg@web.de> 1214653171 +0200

git-parent:

[be48d2fd82f54cc51efa1050eab48600c7dd91fa]

git-author:

Sebastian Gift <Madison@gt-knm.de> 1214653171 +0200

Message:

[bug] Bugfix Warenankauf Handelsposten (Spieler kaufen vom Posten).

Files:

• src/net/driftingsouls/ds2/server/modules/TradeController.java (modified) (2 diffs)

src/net/driftingsouls/ds2/server/modules/TradeController.java

@@ -166 +166 @@
-                        }
-                        totalRE += price;
+                        
+                        if(amountToBuy <= 0) {
+                                continue;
+                        }
+                        
-                        moneyOfBuyer.subtract(BigInteger.valueOf(price));
-                        
-                        assert amountToBuy >= 0: "AmountToBuy darf keine negative Zahl sein";
-                        
-                        if(amountToBuy == 0) {
-                                continue;
-                        }
-                        
-                        this.posten.transfer(this.ship, resource.getId(), amountToBuy);
@@ -342 +341 @@
-                        SellLimit limit = (SellLimit)db.get(SellLimit.class, resourceLimitKey);
-                        
+                        //Nicht kaeuflich
-                        if(limit == null) {
-                                continue;
-                        }
+                        
+                        long buyable = this.posten.getCargo().getResourceCount(resource.getId()) - limit.getMinimum();
+                        if(buyable <= 0) {
+                                continue;
+                        }
+                        
-                        
-                        t.setVar(       "resbuy.img",           resource.getImage(),
-                                                "resbuy.id",            resource.getId(),
-                                                "resbuy.name",          resource.getName(),
-this.posten.getCargo().getResourceCount(resource.getId())
+       buyable
-                                                "resbuy.re",            limit.getPrice() );
-                        t.parse("resbuy.list","resbuy.listitem",true);