Merge branch 'master' into feature/generate-sources

pom.xml

@@ -5,7 +5,7 @@
 	<groupId>com.loohp</groupId>
 	<artifactId>Limbo</artifactId>
 	<name>Limbo</name>
-	<version>0.6.0-ALPHA</version>
+	<version>0.6.1-ALPHA</version>
 	
 	<description>Standalone Limbo Minecraft Server.</description>
 	<url>https://github.com/LOOHP/Limbo</url>

src/main/java/com/loohp/limbo/file/ServerProperties.java

@@ -38,6 +38,7 @@ public class ServerProperties {
 	private Location worldSpawn;
 	private boolean reducedDebugInfo;
 	private boolean allowFlight;
+	private boolean allowChat;
 	private String motdJson;
 	private String versionString;
 	private int protocol;
@@ -93,6 +94,7 @@ public class ServerProperties {
 		worldSpawn = new Location(world, x, y, z, yaw, pitch);
 		reducedDebugInfo = Boolean.parseBoolean(prop.getProperty("reduced-debug-info"));
 		allowFlight = Boolean.parseBoolean(prop.getProperty("allow-flight"));
+		allowChat = Boolean.parseBoolean(prop.getProperty("allow-chat"));
 		motdJson = prop.getProperty("motd");
 		versionString = prop.getProperty("version");
 		bungeecord = Boolean.parseBoolean(prop.getProperty("bungeecord"));
@@ -213,6 +215,10 @@ public class ServerProperties {
 		return allowFlight;
 	}
 
+	public boolean isAllowChat() {
+		return this.allowChat;
+	}
+
 	public String getMotdJson() {
 		return motdJson;
 	}

src/main/java/com/loohp/limbo/player/Player.java

@@ -247,9 +247,10 @@ public class Player extends LivingEntity implements CommandSender {
 	}
 	
 	public void chat(String message) {
+		if (Limbo.getInstance().getServerProperties().isAllowChat()) {
 			String format = "<%name%> %message%";
 			PlayerChatEvent event = (PlayerChatEvent) Limbo.getInstance().getEventsManager().callEvent(new PlayerChatEvent(this, format, message, false));
-		if (!event.isCancelled()) {
+			if (!event.isCancelled() && this.hasPermission("limboserver.chat")) {
 				String chat = event.getFormat().replace("%name%", username).replace("%message%", event.getMessage());
 				Limbo.getInstance().getConsole().sendMessage(chat);
 				for (Player each : Limbo.getInstance().getPlayers()) {
@@ -257,5 +258,6 @@ public class Player extends LivingEntity implements CommandSender {
 				}
 			}
 		}
+	}
 
 }

src/main/resources/permission.yml

@@ -6,6 +6,7 @@ groups:
     - limboserver.gamemode
   default:
     - limboserver.spawn
+    - limboserver.chat
 
 players:
   LOOHP: 

src/main/resources/server.properties

@@ -31,6 +31,10 @@ level-dimension=minecraft:overworld
 #Whether Flying is allowed
 allow-flight=false
 
+#Whether chat messages are allowed
+#Setting this property to false should give more performance but will render the "limboserver.chat" permission powerless
+allow-chat=true
+
 #GameMode, survival, creative, adventure, spectator
 default-gamemode=creative