Changeset 1f8d57aa02c907deeb59c13ed1e8efb19a404267

Timestamp:

02/25/07 11:14:25 (2 years ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

Christopher Jung <bktheg@web.de> 1172398465 +0100

git-parent:

[f893d48fe61df73547fa433cb8114324c3c76a00]

git-author:

Christopher Jung <bktheg@web.de> 1172398465 +0100

Message:

Schlachttick gefixt

Files:

• src/net/driftingsouls/ds2/server/battles/Battle.java (modified) (3 diffs)

src/net/driftingsouls/ds2/server/battles/Battle.java

@@ -28 +28 @@
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.SystemUtils;
-
-import net.driftingsouls.ds2.server.ContextCommon;
@@ -53 +49 @@
-import net.driftingsouls.ds2.server.scripting.Quests;
-import net.driftingsouls.ds2.server.scripting.ScriptParser;
+import net.driftingsouls.ds2.server.ships.ShipClasses;
-import net.driftingsouls.ds2.server.ships.Ships;
-import net.driftingsouls.ds2.server.ships.ShipClasses;
-import net.driftingsouls.ds2.server.tick.TickController;
-import net.driftingsouls.ds2.server.tick.regular.SchiffsTick;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang.math.RandomUtils;
-
-/**
@@ -1847 +1847 @@
-                if( relocate && (ship.getString("docked").length() == 0) ) {
-                        StarSystem sys = Systems.get().system(this.system);
-Random rand = new Random()
-
+int maxRetries = 100
+
-                        while( ((loc.getX() == this.x) && (loc.getY() == this.y)) ||
-                                        (loc.getX() < 1) || (loc.getY() < 1) || 
-                                        (loc.getX() > sys.getWidth()) ||
-                                        (loc.getY() > sys.getHeight()) ) {
-
-
+
+
+
+
+
+
+
-                        }
-                }