From 268b8dc2349106dfb8bca6d20f6565f35db921d3 Mon Sep 17 00:00:00 2001
From: GrizzlT <13691001+GrizzlT@users.noreply.github.com>
Date: Sat, 21 Aug 2021 15:44:03 +0200
Subject: [PATCH] Corrected conditions to better meet expectations

---
 src/main/java/com/loohp/limbo/player/Player.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/loohp/limbo/player/Player.java b/src/main/java/com/loohp/limbo/player/Player.java
index 401c999..b02d579 100644
--- a/src/main/java/com/loohp/limbo/player/Player.java
+++ b/src/main/java/com/loohp/limbo/player/Player.java
@@ -249,7 +249,7 @@ public class Player extends LivingEntity implements CommandSender {
 	public void chat(String message) {
 		String format = "<%name%> %message%";
 		PlayerChatEvent event = (PlayerChatEvent) Limbo.getInstance().getEventsManager().callEvent(new PlayerChatEvent(this, format, message, false));
-		if ((!event.isCancelled() || this.hasPermission("limboserver.chat")) && Limbo.getInstance().getServerProperties().isAllowChat()) {
+		if (!event.isCancelled() && (Limbo.getInstance().getServerProperties().isAllowChat() || 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()) {