Merge branch '2.9' of https://github.com/essentials/Essentials into 2.9

Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java

@@ -60,12 +60,6 @@ public class EssentialsPlayerListener implements Listener
 			user.sendMessage(_("playerMuted"));
 			LOGGER.info(_("mutedUserSpeaks", user.getName()));
 		}
-		if(ess.getSettings().isChatPermEnabled() && !user.isAuthorized("essentials.chat.allowed"))
-		{
-			event.setCancelled(true);
-			user.sendMessage(_("playerChatDenied"));
-			LOGGER.info(_("mutedUserSpeaks", user.getName()));
-		}
 		final Iterator<Player> it = event.getRecipients().iterator();
 		while (it.hasNext())
 		{

Essentials/src/com/earth2me/essentials/ISettings.java

@@ -187,6 +187,4 @@ public interface ISettings extends IConf
 	public void setEssentialsChatActive(boolean b);
 
 	long getMaxTempban();
-
-	boolean isChatPermEnabled();
 }

Essentials/src/com/earth2me/essentials/Settings.java

@@ -1014,10 +1014,4 @@ public class Settings implements ISettings
 	{
 		return config.getLong("max-tempban-time", -1);
 	}
-
-	@Override
-	public boolean isChatPermEnabled()
-	{
-		return config.getBoolean("enable-chat-perm", false);
-	}
 }

Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java

@@ -33,6 +33,7 @@ public class Commandtpahere extends EssentialsCommand
 		player.requestTeleport(user, true);
 		player.sendMessage(_("teleportHereRequest", user.getDisplayName()));
 		player.sendMessage(_("typeTpaccept"));
+		player.sendMessage(_("typeTpdeny"));
 		if (ess.getSettings().getTpaAcceptCancellation() != 0)
 		{
 			player.sendMessage(_("teleportRequestTimeoutInfo", ess.getSettings().getTpaAcceptCancellation()));

Essentials/src/config.yml

@@ -351,9 +351,6 @@ mails-per-minute: 1000
 # Set to -1 to disable, and essentials.tempban.unlimited can be used to override.
 max-tempban-time: -1
 
-# Require users have essentials.chat before they can speak? Any users without this node will not be able to speak
-enable-chat-perm: false
-
 ############################################################
 # +------------------------------------------------------+ #
 # |                   EssentialsHome                     | #

Essentials/src/messages.properties

@@ -478,4 +478,3 @@ recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1}
 recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2}
 recipeWhere=\u00a76Where: {0}
 recipeShapeless=\u00a76Combine \u00a7c{0}
-playerChatDenied=\u00a76You do not have permission to speak.

Essentials/src/messages_cs.properties

@@ -481,4 +481,3 @@ recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1}
 recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2}
 recipeWhere=\u00a76Where: {0}
 recipeShapeless=\u00a76Combine \u00a7c{0}
-playerChatDenied=\u00a76You do not have permission to speak.

Essentials/src/messages_da.properties

@@ -478,4 +478,3 @@ recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1}
 recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2}
 recipeWhere=\u00a76Where: {0}
 recipeShapeless=\u00a76Combine \u00a7c{0}
-playerChatDenied=\u00a76You do not have permission to speak.

Essentials/src/messages_de.properties

@@ -478,4 +478,3 @@ recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1}
 recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2}
 recipeWhere=\u00a76Where: {0}
 recipeShapeless=\u00a76Combine \u00a7c{0}
-playerChatDenied=\u00a76You do not have permission to speak.

Essentials/src/messages_en.properties

@@ -478,4 +478,3 @@ recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1}
 recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2}
 recipeWhere=\u00a76Where: {0}
 recipeShapeless=\u00a76Combine \u00a7c{0}
-playerChatDenied=\u00a76You do not have permission to speak.

Essentials/src/messages_es.properties

@@ -478,4 +478,3 @@ recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1}
 recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2}
 recipeWhere=\u00a76Where: {0}
 recipeShapeless=\u00a76Combine \u00a7c{0}
-playerChatDenied=\u00a76You do not have permission to speak.

Essentials/src/messages_fi.properties

@@ -478,4 +478,3 @@ recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1}
 recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2}
 recipeWhere=\u00a76Where: {0}
 recipeShapeless=\u00a76Combine \u00a7c{0}
-playerChatDenied=\u00a76You do not have permission to speak.

Essentials/src/messages_fr.properties

@@ -478,4 +478,3 @@ recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1}
 recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2}
 recipeWhere=\u00a76Where: {0}
 recipeShapeless=\u00a76Combine \u00a7c{0}
-playerChatDenied=\u00a76You do not have permission to speak.

Essentials/src/messages_it.properties

@@ -478,4 +478,3 @@ recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1}
 recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2}
 recipeWhere=\u00a76Where: {0}
 recipeShapeless=\u00a76Combine \u00a7c{0}
-playerChatDenied=\u00a76You do not have permission to speak.

Essentials/src/messages_nl.properties

@@ -478,4 +478,3 @@ recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1}
 recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2}
 recipeWhere=\u00a76Where: {0}
 recipeShapeless=\u00a76Combine \u00a7c{0}
-playerChatDenied=\u00a76You do not have permission to speak.

Essentials/src/messages_pl.properties

@@ -478,4 +478,3 @@ recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1}
 recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2}
 recipeWhere=\u00a76Where: {0}
 recipeShapeless=\u00a76Combine \u00a7c{0}
-playerChatDenied=\u00a76You do not have permission to speak.

Essentials/src/messages_pt.properties

@@ -478,4 +478,3 @@ recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1}
 recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2}
 recipeWhere=\u00a76Where: {0}
 recipeShapeless=\u00a76Combine \u00a7c{0}
-playerChatDenied=\u00a76You do not have permission to speak.

Essentials/src/messages_se.properties

@@ -478,4 +478,3 @@ recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1}
 recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2}
 recipeWhere=\u00a76Where: {0}
 recipeShapeless=\u00a76Combine \u00a7c{0}
-playerChatDenied=\u00a76You do not have permission to speak.