diff options
| author | KHobbits <rob@khobbits.co.uk> | 2013-10-16 20:59:39 +0100 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2013-10-16 21:05:33 +0100 |
| commit | 6f85761f7fc7949b478c0dec44240f93d4b08a02 (patch) | |
| tree | 1da56d3d8ca883cfb71e766600f336d39ecbccb2 /EssentialsSpawn/src/com | |
| parent | cf9d79d24c8b33d10585a3fc97bc38554dee6d8b (diff) | |
| download | Essentials-6f85761f7fc7949b478c0dec44240f93d4b08a02.tar Essentials-6f85761f7fc7949b478c0dec44240f93d4b08a02.tar.gz Essentials-6f85761f7fc7949b478c0dec44240f93d4b08a02.tar.lz Essentials-6f85761f7fc7949b478c0dec44240f93d4b08a02.tar.xz Essentials-6f85761f7fc7949b478c0dec44240f93d4b08a02.zip | |
Extract CommandSender to CommandSource, this should prevent Ess user object leaks.
Diffstat (limited to 'EssentialsSpawn/src/com')
| -rw-r--r-- | EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java | 4 | ||||
| -rw-r--r-- | EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java index 35edd172c..2317e774c 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java @@ -1,5 +1,6 @@ package com.earth2me.essentials.spawn; +import com.earth2me.essentials.CommandSource; import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.Console; import com.earth2me.essentials.Trade; @@ -9,7 +10,6 @@ import com.earth2me.essentials.commands.NoChargeException; import com.earth2me.essentials.commands.NotEnoughArgumentsException; import org.bukkit.Location; import org.bukkit.Server; -import org.bukkit.command.CommandSender; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; @@ -43,7 +43,7 @@ public class Commandspawn extends EssentialsCommand } @Override - protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception + protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception { if (args.length < 1) { diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java index 6fcabe6e0..668294970 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java @@ -108,7 +108,7 @@ public class EssentialsSpawnPlayerListener implements Listener //This method allows for multiple line player announce messages using multiline yaml syntax #EasterEgg if (ess.getSettings().getAnnounceNewPlayers()) { - final IText output = new KeywordReplacer(ess.getSettings().getAnnounceNewPlayerFormat(), user.getBase(), ess); + final IText output = new KeywordReplacer(ess.getSettings().getAnnounceNewPlayerFormat(), user.getSource(), ess); final SimpleTextPager pager = new SimpleTextPager(output); for (String line : pager.getLines()) |