diff --git a/lib.php b/lib.php
index 2a59d00..48816dd 100644
--- a/lib.php
+++ b/lib.php
@@ -2,7 +2,7 @@
 
 $starttime = getmicrotime();
 $numqueries = 0;
-$version = "1.1.4";
+$version = "1.1.5";
 $build = "";
 
 function opendb() { // Open database connection.
diff --git a/towns.php b/towns.php
index 29e287c..3b3db53 100644
--- a/towns.php
+++ b/towns.php
@@ -335,6 +335,8 @@ function travelto($id, $usepoints=true) { // Send a user to a town from the Trav
     
     global $userrow, $numqueries;
     
+    if ($userrow["currentaction"] == "Fighting") { header("Location: index.php?do=fight"); die(); }
+    
     $townquery = doquery("SELECT name,travelpoints,latitude,longitude FROM {{table}} WHERE id='$id' LIMIT 1", "towns");
     $townrow = mysql_fetch_array($townquery);