Adding join / quit messages in the config test #1697

PlayerChatEvent -> AsyncPlayerChatEvent

3 files changed, 20 insertions, 2 deletions

diff --git a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java
index b14ce9f10..6a0fa57cf 100644
--- a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java
+++ b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java
@@ -13,9 +13,12 @@ import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.user.UserData.TimestampType;
+import net.ess3.utils.FormatUtil;
 import net.ess3.utils.LocationUtil;
 import net.ess3.utils.textreader.IText;
 import net.ess3.utils.textreader.KeywordReplacer;
+import net.ess3.utils.textreader.SimpleTextInput;
+import net.ess3.utils.textreader.SimpleTextPager;
 import net.ess3.utils.textreader.TextInput;
 import net.ess3.utils.textreader.TextPager;
 import org.bukkit.Location;
@@ -114,6 +117,10 @@ public class EssentialsPlayerListener implements Listener
 	@EventHandler(priority = EventPriority.MONITOR)
 	public void onPlayerQuit(final PlayerQuitEvent event)
 	{
+		final IText itOutput = new KeywordReplacer(new SimpleTextInput(ess.getSettings().getData().getGeneral().getLeaveMessage()), event.getPlayer(), ess);
+		final SimpleTextPager stPager = new SimpleTextPager(itOutput);
+		event.setQuitMessage(FormatUtil.replaceFormat(stPager.getString(0)));
+		
 		final IUser user = ess.getUserMap().getUser(event.getPlayer());
 
 		final ISettings settings = ess.getSettings();
@@ -141,8 +148,13 @@ public class EssentialsPlayerListener implements Listener
 		{
 			return;
 		}
+
 		ess.getBackup().startTask();
 
+		final IText itOutput = new KeywordReplacer(new SimpleTextInput(ess.getSettings().getData().getGeneral().getJoinMessage()), event.getPlayer(), ess);
+		final SimpleTextPager stPager = new SimpleTextPager(itOutput);
+		event.setJoinMessage(FormatUtil.replaceFormat(stPager.getString(0)));
+
 		final IUser user = ess.getUserMap().getUser(event.getPlayer());
 
 		user.updateDisplayName();
diff --git a/Essentials/src/net/ess3/settings/General.java b/Essentials/src/net/ess3/settings/General.java
index 91812631f..ff3b46a85 100644
--- a/Essentials/src/net/ess3/settings/General.java
+++ b/Essentials/src/net/ess3/settings/General.java
@@ -78,4 +78,10 @@ public class General implements StorageObject
 		return loginAttackDelay * 1000;
 	}
 	public Boolean metricsEnabled = null;
+	
+	@Comment("The join message when players join the server")
+	private String joinMessage = "&e{PLAYER} has joined the game";
+	
+	@Comment("The quit message when players leave the server")
+	private String leaveMessage ="&e{PLAYER} has left the game";
 }
diff --git a/Essentials/src/net/ess3/settings/WorldOptions.java b/Essentials/src/net/ess3/settings/WorldOptions.java
index fb0da4e07..661f77c30 100644
--- a/Essentials/src/net/ess3/settings/WorldOptions.java
+++ b/Essentials/src/net/ess3/settings/WorldOptions.java
@@ -1,6 +1,6 @@
 package net.ess3.settings;
 
-import java.util.HashMap;
+import java.util.EnumMap;
 import java.util.Map;
 import lombok.AccessLevel;
 import lombok.Data;
@@ -34,7 +34,7 @@ public class WorldOptions implements StorageObject
 	@Comment("Prevent creatures spawning")
 	@Getter(AccessLevel.NONE)
 	@Setter(AccessLevel.NONE)
-	private Map<EntityType, Boolean> creatureSpawn = new HashMap<EntityType, Boolean>();
+	private Map<EntityType, Boolean> creatureSpawn = new EnumMap<EntityType, Boolean>(EntityType.class);
 
 	public boolean getPreventSpawn(String creatureName)
 	{