diff options
| author | snowleo <schneeleo@gmail.com> | 2012-02-21 18:34:53 +0100 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2012-02-21 18:34:53 +0100 |
| commit | 4da3f52164f118825ace616408b4ce13571cab63 (patch) | |
| tree | 05b19c7261df84eaa8a6bda460af562bd72eb484 /EssentialsSpawn | |
| parent | cae3c5a03e2a3306c09132e277b2ea010ec8385b (diff) | |
| parent | cf7da7a83fef4d7734ed1ed5b672f2e07749b679 (diff) | |
| download | Essentials-4da3f52164f118825ace616408b4ce13571cab63.tar Essentials-4da3f52164f118825ace616408b4ce13571cab63.tar.gz Essentials-4da3f52164f118825ace616408b4ce13571cab63.tar.lz Essentials-4da3f52164f118825ace616408b4ce13571cab63.tar.xz Essentials-4da3f52164f118825ace616408b4ce13571cab63.zip | |
Merge branch 'refs/heads/master' into 3.0
Conflicts:
.gitignore
Essentials/src/com/earth2me/essentials/Essentials.java
Essentials/src/com/earth2me/essentials/EssentialsTimer.java
Essentials/src/com/earth2me/essentials/ISettings.java
Essentials/src/com/earth2me/essentials/Jails.java
Essentials/src/com/earth2me/essentials/OfflinePlayer.java
Essentials/src/com/earth2me/essentials/Settings.java
Essentials/src/com/earth2me/essentials/User.java
Essentials/src/com/earth2me/essentials/UserData.java
Essentials/src/com/earth2me/essentials/UserMap.java
Essentials/src/com/earth2me/essentials/Util.java
Essentials/src/com/earth2me/essentials/commands/Commandnear.java
Essentials/src/com/earth2me/essentials/commands/Commandping.java
Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java
Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java
Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java
Essentials/src/com/earth2me/essentials/commands/Commandwarp.java
Essentials/src/messages_en.properties
Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java
Essentials2Compat/src/com/earth2me/essentials/EssentialsUpgrade.java
EssentialsChat/src/plugin.yml
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
Diffstat (limited to 'EssentialsSpawn')
| -rw-r--r-- | EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java index 5dd913ee7..2ff14835f 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java @@ -4,6 +4,10 @@ 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; @@ -83,7 +87,9 @@ public class EssentialsSpawnPlayerListener implements Listener if (spawns.getAnnounceNewPlayers()) { - ess.broadcastMessage(user, spawns.getAnnounceNewPlayerFormat(user)); + final IText output = new KeywordReplacer(new SimpleTextInput(spawns.getAnnounceNewPlayerFormat(user)), user, ess); + final SimpleTextPager pager = new SimpleTextPager(output); + ess.broadcastMessage(user, pager.getString(0)); } } |