From cd38aeb5441da2ebd2ea0bebed66f24f34bf1b3e Mon Sep 17 00:00:00 2001 From: KHobbits Date: Mon, 14 Apr 2014 00:03:07 +0100 Subject: Remove Ess object from FakeServer. --- .../src/com/earth2me/essentials/Essentials.java | 1 + .../src/com/earth2me/essentials/OfflinePlayer.java | 23 +++++++++++----------- Essentials/src/com/earth2me/essentials/User.java | 4 ++-- .../src/com/earth2me/essentials/UserMap.java | 2 +- .../earth2me/essentials/commands/Commandban.java | 2 +- .../earth2me/essentials/commands/Commandmute.java | 2 +- .../test/com/earth2me/essentials/EconomyTest.java | 2 +- .../test/com/earth2me/essentials/FakeServer.java | 4 ++-- .../test/com/earth2me/essentials/StorageTest.java | 2 +- .../test/com/earth2me/essentials/ToggleTest.java | 2 +- .../test/com/earth2me/essentials/UserTest.java | 6 +++--- 11 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index 2b607a813..35e876841 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -680,6 +680,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials LOGGER.log(Level.INFO, "Constructing new userfile from base player {0}", base.getName()); } user = new User(base, this); + user.setLastAccountName(base.getName()); } else { diff --git a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java index 9e725473d..3d7a9d4ae 100644 --- a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java +++ b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java @@ -4,7 +4,6 @@ import static com.earth2me.essentials.I18n.tl; import java.net.InetSocketAddress; import java.util.*; import lombok.Delegate; -import net.ess3.api.IEssentials; import org.bukkit.*; import org.bukkit.block.Block; import org.bukkit.conversations.Conversation; @@ -27,7 +26,7 @@ import org.bukkit.util.Vector; public class OfflinePlayer implements Player { - private final transient IEssentials ess; + private final transient Server server; private transient Location location = new Location(null, 0, 0, 0, 0, 0); private transient World world; @Delegate(types = org.bukkit.OfflinePlayer.class) @@ -35,18 +34,18 @@ public class OfflinePlayer implements Player private boolean allowFlight = false; private boolean isFlying = false; - public OfflinePlayer(final UUID uuid, final IEssentials ess) + public OfflinePlayer(final UUID uuid, final Server server) { - this.ess = ess; - this.world = ess.getServer().getWorlds().get(0); - this.base = ess.getServer().getOfflinePlayer(uuid); + this.server = server; + this.world = server.getWorlds().get(0); + this.base = server.getOfflinePlayer(uuid); } - public OfflinePlayer(final String name, final IEssentials ess) + public OfflinePlayer(final String name, final Server server) { - this.ess = ess; - this.world = ess.getServer().getWorlds().get(0); - this.base = ess.getServer().getOfflinePlayer(name); + this.server = server; + this.world = server.getWorlds().get(0); + this.base = server.getOfflinePlayer(name); } @Override @@ -288,7 +287,7 @@ public class OfflinePlayer implements Player @Override public Server getServer() { - return ess == null ? null : ess.getServer(); + return server; } public Vector getMomentum() @@ -903,7 +902,7 @@ public class OfflinePlayer implements Player { if (!this.base.getName().equalsIgnoreCase(name)) { - this.base = ess.getServer().getOfflinePlayer(name); + this.base = server.getOfflinePlayer(name); } } diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java index c6c81dc84..3b3ef836b 100644 --- a/Essentials/src/com/earth2me/essentials/User.java +++ b/Essentials/src/com/earth2me/essentials/User.java @@ -45,7 +45,7 @@ public class User extends UserData implements Comparable, IReplyTo, net.es private boolean enderSee = false; private transient long teleportInvulnerabilityTimestamp = 0; - User(final Player base, final IEssentials ess) + public User(final Player base, final IEssentials ess) { super(base, ess); teleport = new Teleport(this, ess); @@ -225,7 +225,7 @@ public class User extends UserData implements Comparable, IReplyTo, net.es public void dispose() { - this.base = new OfflinePlayer(base.getUniqueId(), ess); + this.base = new OfflinePlayer(base.getUniqueId(), ess.getServer()); } @Override diff --git a/Essentials/src/com/earth2me/essentials/UserMap.java b/Essentials/src/com/earth2me/essentials/UserMap.java index 7060cbe5a..1c81aa5a1 100644 --- a/Essentials/src/com/earth2me/essentials/UserMap.java +++ b/Essentials/src/com/earth2me/essentials/UserMap.java @@ -206,7 +206,7 @@ public class UserMap extends CacheLoader implements IConf if (userFile.exists()) { keys.add(uuid); - return new User(new OfflinePlayer(uuid, ess), ess); + return new User(new OfflinePlayer(uuid, ess.getServer()), ess); } throw new Exception("User not found!"); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandban.java b/Essentials/src/com/earth2me/essentials/commands/Commandban.java index 1864591a7..a9408360f 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandban.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandban.java @@ -33,7 +33,7 @@ public class Commandban extends EssentialsCommand catch (PlayerNotFoundException e) { nomatch = true; - user = ess.getUser(new OfflinePlayer(args[0], ess)); + user = ess.getUser(new OfflinePlayer(args[0], ess.getServer())); } if (!user.getBase().isOnline()) { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java b/Essentials/src/com/earth2me/essentials/commands/Commandmute.java index fb7968f8e..fc44bc20c 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandmute.java @@ -32,7 +32,7 @@ public class Commandmute extends EssentialsCommand catch (PlayerNotFoundException e) { nomatch = true; - user = ess.getUser(new OfflinePlayer(args[0], ess)); + user = ess.getUser(new OfflinePlayer(args[0], ess.getServer())); } if (!user.getBase().isOnline()) { diff --git a/Essentials/test/com/earth2me/essentials/EconomyTest.java b/Essentials/test/com/earth2me/essentials/EconomyTest.java index 9d18e9f63..34f7f33f8 100644 --- a/Essentials/test/com/earth2me/essentials/EconomyTest.java +++ b/Essentials/test/com/earth2me/essentials/EconomyTest.java @@ -34,7 +34,7 @@ public class EconomyTest extends TestCase { fail("IOException"); } - server.addPlayer(new OfflinePlayer(PLAYERNAME, ess)); + server.addPlayer(new OfflinePlayer(PLAYERNAME, ess.getServer())); } // only one big test, since we use static instances diff --git a/Essentials/test/com/earth2me/essentials/FakeServer.java b/Essentials/test/com/earth2me/essentials/FakeServer.java index 20b098b0c..2786480c5 100644 --- a/Essentials/test/com/earth2me/essentials/FakeServer.java +++ b/Essentials/test/com/earth2me/essentials/FakeServer.java @@ -564,9 +564,9 @@ public class FakeServer implements Server players.add(base1); } - public OfflinePlayer createPlayer(String name, IEssentials ess) + public OfflinePlayer createPlayer(String name) { - OfflinePlayer player = new OfflinePlayer(name, ess); + OfflinePlayer player = new OfflinePlayer(name, this); player.setLocation(new Location(worlds.get(0), 0, 0, 0, 0, 0)); return player; } diff --git a/Essentials/test/com/earth2me/essentials/StorageTest.java b/Essentials/test/com/earth2me/essentials/StorageTest.java index 0412e2264..617d3c6b3 100644 --- a/Essentials/test/com/earth2me/essentials/StorageTest.java +++ b/Essentials/test/com/earth2me/essentials/StorageTest.java @@ -39,7 +39,7 @@ public class StorageTest extends TestCase { ExecuteTimer ext = new ExecuteTimer(); ext.start(); - OfflinePlayer base1 = server.createPlayer("testPlayer1", ess); + OfflinePlayer base1 = server.createPlayer("testPlayer1"); server.addPlayer(base1); ext.mark("fake user created"); UserData user = (UserData)ess.getUser(base1); diff --git a/Essentials/test/com/earth2me/essentials/ToggleTest.java b/Essentials/test/com/earth2me/essentials/ToggleTest.java index db178cf35..d3a496df9 100644 --- a/Essentials/test/com/earth2me/essentials/ToggleTest.java +++ b/Essentials/test/com/earth2me/essentials/ToggleTest.java @@ -33,7 +33,7 @@ public class ToggleTest extends TestCase { fail("IOException"); } - base1 = server.createPlayer("testPlayer1", ess); + base1 = server.createPlayer("testPlayer1"); server.addPlayer(base1); ess.getUser(base1); } diff --git a/Essentials/test/com/earth2me/essentials/UserTest.java b/Essentials/test/com/earth2me/essentials/UserTest.java index c1386cfab..7bae28c31 100644 --- a/Essentials/test/com/earth2me/essentials/UserTest.java +++ b/Essentials/test/com/earth2me/essentials/UserTest.java @@ -33,7 +33,7 @@ public class UserTest extends TestCase { fail("IOException"); } - base1 = server.createPlayer("testPlayer1", ess); + base1 = server.createPlayer("testPlayer1"); server.addPlayer(base1); ess.getUser(base1); } @@ -45,7 +45,7 @@ public class UserTest extends TestCase public void testUpdate() { - OfflinePlayer base1alt = server.createPlayer(base1.getName(), ess); + OfflinePlayer base1alt = server.createPlayer(base1.getName()); assertEquals(base1alt, ess.getUser(base1alt).getBase()); } @@ -54,7 +54,7 @@ public class UserTest extends TestCase User user = ess.getUser(base1); Location loc = base1.getLocation(); user.setHome("home", loc); - OfflinePlayer base2 = server.createPlayer(base1.getName(), ess); + OfflinePlayer base2 = server.createPlayer(base1.getName()); User user2 = ess.getUser(base2); Location home = user2.getHome(loc); -- cgit v1.2.3