From f5be1eb44bf655b239edb87c8e34e7982f7083b0 Mon Sep 17 00:00:00 2001 From: sk89q Date: Fri, 19 Oct 2012 15:44:24 -0700 Subject: [PATCH] Removed BukkitWorld caching. --- .../sk89q/worldedit/bukkit/BukkitUtil.java | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/sk89q/worldedit/bukkit/BukkitUtil.java b/src/main/java/com/sk89q/worldedit/bukkit/BukkitUtil.java index 5655a85fa..377373f98 100644 --- a/src/main/java/com/sk89q/worldedit/bukkit/BukkitUtil.java +++ b/src/main/java/com/sk89q/worldedit/bukkit/BukkitUtil.java @@ -23,11 +23,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.sk89q.worldedit.bukkit.entity.BukkitEntity; -import com.sk89q.worldedit.bukkit.entity.BukkitExpOrb; -import com.sk89q.worldedit.bukkit.entity.BukkitItem; -import com.sk89q.worldedit.bukkit.entity.BukkitPainting; - +import org.bukkit.Server; +import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.entity.Entity; @@ -35,8 +32,6 @@ import org.bukkit.entity.ExperienceOrb; import org.bukkit.entity.Item; import org.bukkit.entity.Painting; import org.bukkit.entity.Player; -import org.bukkit.Server; -import org.bukkit.World; import com.sk89q.worldedit.BlockVector; import com.sk89q.worldedit.BlockWorldVector; @@ -44,6 +39,10 @@ import com.sk89q.worldedit.LocalWorld; import com.sk89q.worldedit.Location; import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.WorldVector; +import com.sk89q.worldedit.bukkit.entity.BukkitEntity; +import com.sk89q.worldedit.bukkit.entity.BukkitExpOrb; +import com.sk89q.worldedit.bukkit.entity.BukkitItem; +import com.sk89q.worldedit.bukkit.entity.BukkitPainting; public class BukkitUtil { private BukkitUtil() { @@ -52,12 +51,7 @@ public class BukkitUtil { private static final Map wlw = new HashMap(); public static LocalWorld getLocalWorld(World w) { - LocalWorld lw = wlw.get(w); - if (lw == null) { - lw = new BukkitWorld(w); - wlw.put(w, lw); - } - return lw; + return new BukkitWorld(w); } public static BlockVector toVector(Block block) {