From f8160c63185737335b24766bb445b77b7feeeb2d Mon Sep 17 00:00:00 2001 From: drtshock Date: Thu, 16 Apr 2015 09:08:22 -0500 Subject: [PATCH] 1.8.3 update. --- .../earth2me/essentials/OfflinePlayer.java | 20 ++++++++ .../src/com/earth2me/essentials/UserMap.java | 3 +- .../essentials/commands/Commandbreak.java | 4 +- .../essentials/commands/Commandlightning.java | 4 +- .../essentials/craftbukkit/FakeWorld.java | 15 ++++++ .../essentials/signs/SignPlayerListener.java | 3 +- .../com/earth2me/essentials/FakeServer.java | 51 +++++++++++++++++++ 7 files changed, 96 insertions(+), 4 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java index 1df8ec209..555e8d2c9 100644 --- a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java +++ b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java @@ -214,16 +214,31 @@ public class OfflinePlayer implements Player { throw new UnsupportedOperationException(tl("notSupportedYet")); } + @Override + public List getLineOfSight(Set mat, int i) { + throw new UnsupportedOperationException(tl("notSupportedYet")); + } + @Override public Block getTargetBlock(HashSet hs, int i) { throw new UnsupportedOperationException(tl("notSupportedYet")); } + @Override + public Block getTargetBlock(Set mat, int i) { + throw new UnsupportedOperationException(tl("notSupportedYet")); + } + @Override public List getLastTwoTargetBlocks(HashSet hs, int i) { throw new UnsupportedOperationException(tl("notSupportedYet")); } + @Override + public List getLastTwoTargetBlocks(Set mat, int i) { + throw new UnsupportedOperationException(tl("notSupportedYet")); + } + @Override public int getFireTicks() { throw new UnsupportedOperationException(tl("notSupportedYet")); @@ -1271,6 +1286,11 @@ public class OfflinePlayer implements Player { return base.getPlayer(); } + @Override + public Spigot spigot() { + return base.getPlayer().spigot(); + } + @Override public long getFirstPlayed() { return base.getFirstPlayed(); diff --git a/Essentials/src/com/earth2me/essentials/UserMap.java b/Essentials/src/com/earth2me/essentials/UserMap.java index 788f6c55c..1d2870d4b 100644 --- a/Essentials/src/com/earth2me/essentials/UserMap.java +++ b/Essentials/src/com/earth2me/essentials/UserMap.java @@ -4,6 +4,7 @@ import com.earth2me.essentials.utils.StringUtil; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; import com.google.common.util.concurrent.UncheckedExecutionException; import net.ess3.api.IEssentials; import org.bukkit.entity.Player; @@ -17,7 +18,7 @@ import java.util.concurrent.ExecutionException; public class UserMap extends CacheLoader implements IConf { private final transient IEssentials ess; - private final transient Cache users; + private final transient LoadingCache users; private final transient ConcurrentSkipListSet keys = new ConcurrentSkipListSet(); private final transient ConcurrentSkipListMap names = new ConcurrentSkipListMap(); private final transient ConcurrentSkipListMap> history = new ConcurrentSkipListMap>(); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbreak.java b/Essentials/src/com/earth2me/essentials/commands/Commandbreak.java index e6b36246a..f5ae3d973 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandbreak.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandbreak.java @@ -6,6 +6,8 @@ import org.bukkit.Server; import org.bukkit.block.Block; import org.bukkit.event.block.BlockBreakEvent; +import java.util.HashSet; + import static com.earth2me.essentials.I18n.tl; @@ -17,7 +19,7 @@ public class Commandbreak extends EssentialsCommand { //TODO: Switch to use util class @Override public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { - final Block block = user.getBase().getTargetBlock(null, 20); + final Block block = user.getBase().getTargetBlock((HashSet) null, 20); if (block == null) { throw new NoChargeException(); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java b/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java index 98920e377..b522ab1a2 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java @@ -5,6 +5,8 @@ import com.earth2me.essentials.User; import org.bukkit.Server; import org.bukkit.entity.LightningStrike; +import java.util.HashSet; + import static com.earth2me.essentials.I18n.tl; @@ -21,7 +23,7 @@ public class Commandlightning extends EssentialsLoopCommand { if (sender.isPlayer()) { user = ess.getUser(sender.getPlayer()); if ((args.length < 1 || user != null && !user.isAuthorized("essentials.lightning.others"))) { - user.getWorld().strikeLightning(user.getBase().getTargetBlock(null, 600).getLocation()); + user.getWorld().strikeLightning(user.getBase().getTargetBlock((HashSet) null, 600).getLocation()); return; } } diff --git a/Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java b/Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java index 7aebe31b6..54e3345ce 100644 --- a/Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java +++ b/Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java @@ -621,4 +621,19 @@ public class FakeWorld implements World { public boolean createExplosion(double d, double d1, double d2, float f, boolean bln, boolean bln1) { throw new UnsupportedOperationException("Not supported yet."); } + + @Override + public WorldBorder getWorldBorder() { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public Spigot spigot() { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public List getNearbyEntities(Location loc, double x, double y, double z) { + throw new UnsupportedOperationException("Not supported yet."); + } } diff --git a/Essentials/src/com/earth2me/essentials/signs/SignPlayerListener.java b/Essentials/src/com/earth2me/essentials/signs/SignPlayerListener.java index ebb4613bc..ac2c9b8ca 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignPlayerListener.java @@ -10,6 +10,7 @@ import org.bukkit.event.Listener; import org.bukkit.event.block.Action; import org.bukkit.event.player.PlayerInteractEvent; +import java.util.HashSet; import java.util.logging.Level; @@ -37,7 +38,7 @@ public class SignPlayerListener implements Listener { if (event.isCancelled() && event.getAction() == Action.RIGHT_CLICK_AIR) { Block targetBlock = null; try { - targetBlock = event.getPlayer().getTargetBlock(null, 5); + targetBlock = event.getPlayer().getTargetBlock((HashSet) null, 5); } catch (IllegalStateException ex) { if (ess.getSettings().isDebug()) { ess.getLogger().log(Level.WARNING, ex.getMessage(), ex); diff --git a/Essentials/test/com/earth2me/essentials/FakeServer.java b/Essentials/test/com/earth2me/essentials/FakeServer.java index 664afd08a..9567d21f3 100644 --- a/Essentials/test/com/earth2me/essentials/FakeServer.java +++ b/Essentials/test/com/earth2me/essentials/FakeServer.java @@ -25,6 +25,7 @@ import org.bukkit.permissions.PermissionAttachment; import org.bukkit.permissions.PermissionAttachmentInfo; import org.bukkit.plugin.*; import org.bukkit.plugin.messaging.Messenger; +import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitScheduler; import org.bukkit.scheduler.BukkitTask; import org.bukkit.scheduler.BukkitWorker; @@ -158,16 +159,31 @@ public class FakeServer implements Server { throw new UnsupportedOperationException("Not supported yet."); } + @Override + public int scheduleSyncDelayedTask(Plugin plugin, BukkitRunnable bukkitRunnable, long l) { + throw new UnsupportedOperationException("Not supported yet."); + } + @Override public int scheduleSyncDelayedTask(Plugin plugin, Runnable r) { throw new UnsupportedOperationException("Not supported yet."); } + @Override + public int scheduleSyncDelayedTask(Plugin plugin, BukkitRunnable bukkitRunnable) { + throw new UnsupportedOperationException("Not supported yet."); + } + @Override public int scheduleSyncRepeatingTask(Plugin plugin, Runnable r, long l, long l1) { throw new UnsupportedOperationException("Not supported yet."); } + @Override + public int scheduleSyncRepeatingTask(Plugin plugin, BukkitRunnable bukkitRunnable, long l, long l1) { + throw new UnsupportedOperationException("Not supported yet."); + } + @Override public int scheduleAsyncRepeatingTask(Plugin plugin, Runnable r, long l, long l1) { throw new UnsupportedOperationException("Not supported yet."); @@ -218,33 +234,63 @@ public class FakeServer implements Server { throw new UnsupportedOperationException("Not supported yet."); } + @Override + public BukkitTask runTask(Plugin plugin, BukkitRunnable bukkitRunnable) throws IllegalArgumentException { + return null; + } + @Override public BukkitTask runTaskAsynchronously(Plugin plugin, Runnable r) throws IllegalArgumentException { r.run(); return null; } + @Override + public BukkitTask runTaskAsynchronously(Plugin plugin, BukkitRunnable bukkitRunnable) throws IllegalArgumentException { + return null; + } + @Override public BukkitTask runTaskLater(Plugin plugin, Runnable r, long l) throws IllegalArgumentException { throw new UnsupportedOperationException("Not supported yet."); } + @Override + public BukkitTask runTaskLater(Plugin plugin, BukkitRunnable bukkitRunnable, long l) throws IllegalArgumentException { + return null; + } + @Override public BukkitTask runTaskLaterAsynchronously(Plugin plugin, Runnable r, long l) throws IllegalArgumentException { r.run(); return null; } + @Override + public BukkitTask runTaskLaterAsynchronously(Plugin plugin, BukkitRunnable bukkitRunnable, long l) throws IllegalArgumentException { + return null; + } + @Override public BukkitTask runTaskTimer(Plugin plugin, Runnable r, long l, long l1) throws IllegalArgumentException { throw new UnsupportedOperationException("Not supported yet."); } + @Override + public BukkitTask runTaskTimer(Plugin plugin, BukkitRunnable bukkitRunnable, long l, long l1) throws IllegalArgumentException { + return null; + } + @Override public BukkitTask runTaskTimerAsynchronously(Plugin plugin, Runnable r, long l, long l1) throws IllegalArgumentException { throw new UnsupportedOperationException("Not supported yet."); } + @Override + public BukkitTask runTaskTimerAsynchronously(Plugin plugin, BukkitRunnable bukkitRunnable, long l, long l1) throws IllegalArgumentException { + return null; + } + @Override public int scheduleAsyncDelayedTask(Plugin plugin, Runnable r, long l) { throw new UnsupportedOperationException("Not supported yet."); @@ -868,6 +914,11 @@ public class FakeServer implements Server { throw new UnsupportedOperationException("Not supported yet."); } + @Override + public Spigot spigot() { + throw new UnsupportedOperationException("Not supported yet."); + } + @Override public BanList getBanList(BanList.Type arg0) { throw new UnsupportedOperationException("Not supported yet.");