From e4be631f27259a2b1bdbcfcb7794b7ccff8dbf75 Mon Sep 17 00:00:00 2001
From: kaenganxt <kaenganxt@yahoo.de>
Date: Fri, 5 Dec 2014 18:02:02 +0100
Subject: [PATCH] - Fix other worlds - Remove backslashes in escapeString too -
 Remove unused import

---
 src/de/anura/core/API/Core.java          | 2 +-
 src/de/anura/core/API/MySQL.java         | 2 +-
 src/de/anura/core/Features.java          | 2 +-
 src/de/anura/core/FlowerPots.java        | 2 +-
 src/de/anura/core/events/PlayerJoin.java | 1 -
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/de/anura/core/API/Core.java b/src/de/anura/core/API/Core.java
index da3d8a2..83677e7 100644
--- a/src/de/anura/core/API/Core.java
+++ b/src/de/anura/core/API/Core.java
@@ -91,7 +91,7 @@ public class Core {
         } else {
             chatColor = ChatColor.RED;
         }
-        P.sendMessage(ChatColor.GRAY + "[Anura] " + chatColor + Core.getl(id, Core.getPlayerLang(P)));
+        statusMsg(P, id, chatColor);
     }
 
     /**
diff --git a/src/de/anura/core/API/MySQL.java b/src/de/anura/core/API/MySQL.java
index e29f886..73544e4 100644
--- a/src/de/anura/core/API/MySQL.java
+++ b/src/de/anura/core/API/MySQL.java
@@ -56,7 +56,7 @@ public class MySQL {
     }
 
     public String escapeString(String text) {
-        return text == null ? "" : text.replace("'", "\\'");
+        return text == null ? "" : text.replace("\\", "").replace("'", "\\'");
     }
 
     private Boolean openConnection() {
diff --git a/src/de/anura/core/Features.java b/src/de/anura/core/Features.java
index c026e47..1f33ce3 100644
--- a/src/de/anura/core/Features.java
+++ b/src/de/anura/core/Features.java
@@ -224,7 +224,7 @@ public class Features implements Listener {
 
             if (this.hasFeature(P, Feature.BOAT) && featureEnabled.get(P).get(Feature.BOAT)) {
                 if (P.getLocation().getBlock().getType().equals(Material.STATIONARY_WATER) && P.getVehicle() == null) {
-                    if (P.getLocation().distance(atwCenter) < 30) return;
+                    if (P.getWorld().equals(atwCenter.getWorld()) && P.getLocation().distance(atwCenter) < 30) return;
                     Boat b = (Boat) P.getWorld().spawnEntity(event.getTo(), EntityType.BOAT);
                     b.setPassenger(P);
                 }
diff --git a/src/de/anura/core/FlowerPots.java b/src/de/anura/core/FlowerPots.java
index 2c6bd20..4c04081 100644
--- a/src/de/anura/core/FlowerPots.java
+++ b/src/de/anura/core/FlowerPots.java
@@ -32,7 +32,7 @@ public class FlowerPots {
         }
         return false;
     }
-
+    
     private int getPotWaitTime(Integer pot) {
         if (AnuraCore.getInstance().flowerPots.containsKey(pot)) {
             if (AnuraCore.getInstance().flowerPotsWait.containsKey(pot)) {
diff --git a/src/de/anura/core/events/PlayerJoin.java b/src/de/anura/core/events/PlayerJoin.java
index 0ff429d..eb277c8 100644
--- a/src/de/anura/core/events/PlayerJoin.java
+++ b/src/de/anura/core/events/PlayerJoin.java
@@ -4,7 +4,6 @@ import de.anura.core.API.Core;
 import de.anura.core.API.Errors;
 import de.anura.core.AnuraCore;
 import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.UUID;
 
 import org.bukkit.event.EventHandler;