Changeset bd3106ac7b1730ceddf14be98d9a38e7998937c1

Timestamp:

05/16/08 17:06:53 (3 months ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

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

git-parent:

[bd48d09b42ecccf034c225d49723f3080ceac39e]

git-author:

Simon Dietsch <rhonabwy@sternenbund.org> 1210950413 +0200

Message:

[bug] Hotfix Batterien entladen im Kampf

Files:

• src/net/driftingsouls/ds2/server/modules/ks/KSDischargeBatteriesAllAction.java (modified) (1 diff)
• src/net/driftingsouls/ds2/server/modules/ks/KSDischargeBatteriesSingleAction.java (modified) (1 diff)

src/net/driftingsouls/ds2/server/modules/ks/KSDischargeBatteriesAllAction.java

@@ -98 +98 @@
-                        mycargo.addResource( Resources.LBATTERIEN, batterien );
-                        
+                        aship.getShip().setCargo(mycargo);
+                        
-                        battle.logme( aship.getName()+": "+batterien+" Reservebatterien entladen\n" );
-                        ebattslog.append(Battle.log_shiplink(aship.getShip())+": Reservebatterien entladen\n");

src/net/driftingsouls/ds2/server/modules/ks/KSDischargeBatteriesSingleAction.java

@@ -80 +80 @@
-                ownShip.getShip().setEnergy((int)(ownShip.getShip().getEnergy()+batterien));
-                ownShip.getShip().setBattleAction(true);
-                ownShip.getShip().setCargo(mycargo);
-        
-                mycargo.substractResource( Resources.BATTERIEN, batterien );
-                mycargo.addResource( Resources.LBATTERIEN, batterien );
+                
+                ownShip.getShip().setCargo(mycargo);
-
-                battle.logenemy("<action side=\""+battle.getOwnSide()+"\" time=\""+Common.time()+"\" tick=\""+context.get(ContextCommon.class).getTick()+"\"><![CDATA[\n");