From c713be8c82c07e00a224e99e5034cc12961360ce Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 13 Feb 2012 18:05:59 +1100 Subject: No need for that CraftBukkit hack anymore --- .../essentials/craftbukkit/OfflineBedLocation.java | 51 ---------------------- .../src/com/earth2me/essentials/user/UserBase.java | 9 +--- 2 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 Essentials/src/com/earth2me/essentials/craftbukkit/OfflineBedLocation.java diff --git a/Essentials/src/com/earth2me/essentials/craftbukkit/OfflineBedLocation.java b/Essentials/src/com/earth2me/essentials/craftbukkit/OfflineBedLocation.java deleted file mode 100644 index 8a89c7052..000000000 --- a/Essentials/src/com/earth2me/essentials/craftbukkit/OfflineBedLocation.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.earth2me.essentials.craftbukkit; - -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.storage.Location; -import java.util.logging.Level; -import java.util.logging.Logger; -import net.minecraft.server.NBTTagCompound; -import net.minecraft.server.WorldNBTStorage; -import org.bukkit.craftbukkit.CraftServer; - - -public class OfflineBedLocation -{ - public static Location getBedLocation(final String playername, final IEssentials ess) - { - try - { - final CraftServer cserver = (CraftServer)ess.getServer(); - if (cserver == null) - { - return null; - } - final WorldNBTStorage wnbtStorage = (WorldNBTStorage)cserver.getHandle().playerFileData; - if (wnbtStorage == null) - { - return null; - } - final NBTTagCompound playerStorage = wnbtStorage.getPlayerData(playername); - if (playerStorage == null) - { - return null; - } - - if (playerStorage.hasKey("SpawnX") && playerStorage.hasKey("SpawnY") && playerStorage.hasKey("SpawnZ")) - { - String spawnWorld = playerStorage.getString("SpawnWorld"); - if ("".equals(spawnWorld)) - { - spawnWorld = cserver.getWorlds().get(0).getName(); - } - return new Location(spawnWorld, playerStorage.getInt("SpawnX"), playerStorage.getInt("SpawnY"), playerStorage.getInt("SpawnZ")); - } - return null; - } - catch (Throwable ex) - { - Logger.getLogger("Minecraft").log(Level.SEVERE, null, ex); - return null; - } - } -} diff --git a/Essentials/src/com/earth2me/essentials/user/UserBase.java b/Essentials/src/com/earth2me/essentials/user/UserBase.java index f1e9c8c34..10fda73f7 100644 --- a/Essentials/src/com/earth2me/essentials/user/UserBase.java +++ b/Essentials/src/com/earth2me/essentials/user/UserBase.java @@ -120,14 +120,7 @@ public abstract class UserBase extends AsyncStorageObjectHolder implem } else { - try - { - return OfflineBedLocation.getBedLocation(base.getName(), ess).getBukkitLocation(); - } - catch (WorldNotLoadedException ex) - { - return null; - } + return ess.getServer().getOfflinePlayer(base.getName()).getBedSpawnLocation(); } } -- cgit v1.2.3