From 0155bcedb7f00726d0b2f14e612a5342322a8278 Mon Sep 17 00:00:00 2001 From: snowleo Date: Wed, 14 Dec 2011 16:31:08 +0100 Subject: Updated all modules to new api, some settings are still missing --- .../essentials/spawn/EssentialsSpawnPlayerListener.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java') diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java index 530a00faa..4c4a60997 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.spawn; import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.IEssentials; -import com.earth2me.essentials.User; +import com.earth2me.essentials.api.IEssentials; +import com.earth2me.essentials.api.IUser; import java.util.logging.Level; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -27,7 +27,7 @@ public class EssentialsSpawnPlayerListener extends PlayerListener @Override public void onPlayerRespawn(final PlayerRespawnEvent event) { - final User user = ess.getUser(event.getPlayer()); + final IUser user = ess.getUser(event.getPlayer()); if (ess.getSettings().getRespawnAtHome()) { @@ -52,7 +52,7 @@ public class EssentialsSpawnPlayerListener extends PlayerListener @Override public void onPlayerJoin(final PlayerJoinEvent event) { - final User user = ess.getUser(event.getPlayer()); + final IUser user = ess.getUser(event.getPlayer()); if (!user.isNew() || user.getBedSpawnLocation() != null) { @@ -73,9 +73,9 @@ public class EssentialsSpawnPlayerListener extends PlayerListener private class NewPlayerTeleport implements Runnable { - private final transient User user; + private final transient IUser user; - public NewPlayerTeleport(final User user) + public NewPlayerTeleport(final IUser user) { this.user = user; } -- cgit v1.2.3 From 41e0e64a5f83cb036e90d3c299f65b69caa9dd63 Mon Sep 17 00:00:00 2001 From: snowleo Date: Mon, 2 Jan 2012 22:38:47 +0100 Subject: EssentialsSpawn and EssentialsChat should build now again --- .../spawn/EssentialsSpawnPlayerListener.java | 36 ++++++++++++++++------ 1 file changed, 27 insertions(+), 9 deletions(-) (limited to 'EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java') diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java index 4c4a60997..a345b3f30 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java @@ -2,6 +2,7 @@ package com.earth2me.essentials.spawn; import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.api.IEssentials; +import com.earth2me.essentials.api.ISettings; import com.earth2me.essentials.api.IUser; import java.util.logging.Level; import org.bukkit.Bukkit; @@ -28,8 +29,16 @@ public class EssentialsSpawnPlayerListener extends PlayerListener public void onPlayerRespawn(final PlayerRespawnEvent event) { final IUser user = ess.getUser(event.getPlayer()); - - if (ess.getSettings().getRespawnAtHome()) + + boolean respawnAtHome = false; + ISettings settings = ess.getSettings(); + settings.acquireReadLock(); + try { + respawnAtHome = ess.getSettings().getData().getCommands().getHome().isRespawnAtHome(); + } finally { + settings.unlock(); + } + if (respawnAtHome) { Location home = user.getHome(user.getLocation()); if (home == null) @@ -53,20 +62,29 @@ public class EssentialsSpawnPlayerListener extends PlayerListener public void onPlayerJoin(final PlayerJoinEvent event) { final IUser user = ess.getUser(event.getPlayer()); + user.acquireReadLock(); + try + { - if (!user.isNew() || user.getBedSpawnLocation() != null) + if (!user.getData().isNewplayer() || user.getBedSpawnLocation() != null) + { + return; + } + user.acquireWriteLock(); + user.getData().setNewplayer(false); + } + finally { - return; + user.unlock(); } - user.setNew(false); - if (!"none".equalsIgnoreCase(ess.getSettings().getNewbieSpawn())) + if (spawns.getNewbieSpawn() != null) { ess.scheduleSyncDelayedTask(new NewPlayerTeleport(user)); } - if (ess.getSettings().getAnnounceNewPlayers()) + if (spawns.getAnnounceNewPlayers()) { - ess.broadcastMessage(user, ess.getSettings().getAnnounceNewPlayerFormat(user)); + ess.broadcastMessage(user, spawns.getAnnounceNewPlayerFormat(user)); } } @@ -85,7 +103,7 @@ public class EssentialsSpawnPlayerListener extends PlayerListener { try { - Location spawn = spawns.getSpawn(ess.getSettings().getNewbieSpawn()); + Location spawn = spawns.getNewbieSpawn(); if (spawn != null) { user.getTeleport().now(spawn, false, TeleportCause.PLUGIN); -- cgit v1.2.3 From 307c6c7bf0465a741034786686806a9b094df4a1 Mon Sep 17 00:00:00 2001 From: ementalo Date: Tue, 24 Jan 2012 22:50:34 +0000 Subject: remove merge leftovers Don't try to spawn users who have disconnected before we have a chance to spawn them --- .../earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java') diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java index 21bd0d499..de58d86ed 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java @@ -7,6 +7,7 @@ import com.earth2me.essentials.api.IUser; import java.util.logging.Level; import org.bukkit.Bukkit; import org.bukkit.Location; +import org.bukkit.OfflinePlayer; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerRespawnEvent; @@ -93,6 +94,11 @@ public class EssentialsSpawnPlayerListener implements Listener @Override public void run() { + if (user.getBase() instanceof OfflinePlayer) + { + return; + } + try { final Location spawn = spawns.getNewbieSpawn(); -- cgit v1.2.3 From 36d79079871145f3e08156c6aac34464b8f2fdd9 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sat, 28 Jan 2012 13:40:10 +0000 Subject: Fix missing import. --- .../src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java | 1 + 1 file changed, 1 insertion(+) (limited to 'EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java') diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java index 248ac15b7..48a74557b 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java @@ -7,6 +7,7 @@ import com.earth2me.essentials.api.IUser; import java.util.logging.Level; import org.bukkit.Bukkit; import org.bukkit.Location; +import org.bukkit.Material; import org.bukkit.OfflinePlayer; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; -- cgit v1.2.3 From e960078e1ad87cd509e5b13eafd02e3ecb7136a7 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sat, 28 Jan 2012 14:05:50 +0000 Subject: Random Cleanup --- .../com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java') diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java index 48a74557b..bab6bd822 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java @@ -104,7 +104,7 @@ public class EssentialsSpawnPlayerListener implements Listener { return; } - + try { final Location spawn = spawns.getNewbieSpawn(); -- cgit v1.2.3 From 539700cb215e088546e5d7f7bba4e1035466626e Mon Sep 17 00:00:00 2001 From: snowleo Date: Mon, 6 Feb 2012 22:13:39 +0100 Subject: New Groups code, supports groups.yml file, gm and vault, new economy api. --- .../com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java') diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java index bab6bd822..5dd913ee7 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java @@ -60,7 +60,7 @@ public class EssentialsSpawnPlayerListener implements Listener return; } } - final Location spawn = spawns.getSpawn(user.getGroup()); + final Location spawn = spawns.getSpawn(ess.getGroups().getMainGroup(user)); if (spawn != null) { event.setRespawnLocation(spawn); -- cgit v1.2.3 From 3ed78c052086d7838fd8e5dd2b3acf50acb3ecf1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Mar 2012 13:19:10 +1100 Subject: Move EssentialsSpawn into the main plugin, going to make it a component in the near future --- .../spawn/EssentialsSpawnPlayerListener.java | 128 --------------------- 1 file changed, 128 deletions(-) delete mode 100644 EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java (limited to 'EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java') diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java deleted file mode 100644 index 2ff14835f..000000000 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java +++ /dev/null @@ -1,128 +0,0 @@ -package com.earth2me.essentials.spawn; - -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.textreader.IText; -import com.earth2me.essentials.textreader.KeywordReplacer; -import com.earth2me.essentials.textreader.SimpleTextInput; -import com.earth2me.essentials.textreader.SimpleTextPager; -import java.util.logging.Level; -import org.bukkit.Bukkit; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.OfflinePlayer; -import org.bukkit.event.Listener; -import org.bukkit.event.player.PlayerJoinEvent; -import org.bukkit.event.player.PlayerRespawnEvent; -import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; - - -public class EssentialsSpawnPlayerListener implements Listener -{ - private final transient IEssentials ess; - private final transient SpawnStorage spawns; - - public EssentialsSpawnPlayerListener(final IEssentials ess, final SpawnStorage spawns) - { - super(); - this.ess = ess; - this.spawns = spawns; - } - - public void onPlayerRespawn(final PlayerRespawnEvent event) - { - final IUser user = ess.getUser(event.getPlayer()); - - boolean respawnAtHome = false; - final ISettings settings = ess.getSettings(); - settings.acquireReadLock(); - try - { - respawnAtHome = ess.getSettings().getData().getCommands().getHome().isRespawnAtHome(); - } - finally - { - settings.unlock(); - } - if (respawnAtHome) - { - Location home; - final Location bed = user.getBedSpawnLocation(); - if (bed != null && bed.getBlock().getType() == Material.BED_BLOCK) - { - home = bed; - } - else - { - home = user.getHome(user.getLocation()); - } - if (home != null) - { - event.setRespawnLocation(home); - return; - } - } - final Location spawn = spawns.getSpawn(ess.getGroups().getMainGroup(user)); - if (spawn != null) - { - event.setRespawnLocation(spawn); - } - } - - public void onPlayerJoin(final PlayerJoinEvent event) - { - final IUser user = ess.getUser(event.getPlayer()); - - if (user.hasPlayedBefore()) - { - return; - } - - if (spawns.getNewbieSpawn() != null) - { - ess.scheduleSyncDelayedTask(new NewPlayerTeleport(user), 1L); - } - - if (spawns.getAnnounceNewPlayers()) - { - final IText output = new KeywordReplacer(new SimpleTextInput(spawns.getAnnounceNewPlayerFormat(user)), user, ess); - final SimpleTextPager pager = new SimpleTextPager(output); - ess.broadcastMessage(user, pager.getString(0)); - } - } - - - private class NewPlayerTeleport implements Runnable - { - private final transient IUser user; - - public NewPlayerTeleport(final IUser user) - { - this.user = user; - } - - @Override - public void run() - { - if (user.getBase() instanceof OfflinePlayer) - { - return; - } - - try - { - final Location spawn = spawns.getNewbieSpawn(); - if (spawn != null) - { - user.getTeleport().now(spawn, false, TeleportCause.PLUGIN); - } - } - catch (Exception ex) - { - Bukkit.getLogger().log(Level.WARNING, _("teleportNewPlayerError"), ex); - } - } - } -} -- cgit v1.2.3