From d5398cbde2e1ca61a4ed00837121d761660685d5 Mon Sep 17 00:00:00 2001
From: Chaos <chaos@chaoscaot.de>
Date: Thu, 22 Aug 2024 11:17:17 +0200
Subject: [PATCH] Remove redundant checks

---
 .../src/de/steamwar/velocitycore/discord/DiscordBot.java        | 2 --
 .../steamwar/velocitycore/discord/channels/DiscordChatRoom.java | 2 --
 .../velocitycore/discord/listeners/DiscordTicketHandler.java    | 2 --
 3 files changed, 6 deletions(-)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java b/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java
index 5f770366..5a80a04f 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java
@@ -149,8 +149,6 @@ public class DiscordBot {
         announcementChannel = new DiscordChannel(config.channel("announcement")) {
             @Override
             public void received(MessageReceivedEvent event) {
-                if (!event.isFromGuild()) return;
-
                 Chatter.broadcast().system("ALERT", event.getMessage().getContentDisplay());
             }
         };
diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/channels/DiscordChatRoom.java b/VelocityCore/src/de/steamwar/velocitycore/discord/channels/DiscordChatRoom.java
index 7aec1362..ce54b2d5 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/channels/DiscordChatRoom.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/channels/DiscordChatRoom.java
@@ -41,8 +41,6 @@ public class DiscordChatRoom extends DiscordChannel {
 
     @Override
     public void received(MessageReceivedEvent event) {
-        if (!event.isFromGuild()) return;
-
         SteamwarUser user = SteamwarUser.get(event.getAuthor().getIdLong());
         if (user == null || event.getMessage().getContentRaw().length() > 250 || user.isPunished(Punishment.PunishmentType.Ban) || user.isPunished(Punishment.PunishmentType.Mute)) {
             event.getMessage().delete().queue();
diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordTicketHandler.java b/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordTicketHandler.java
index e5cabd91..af36de97 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordTicketHandler.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordTicketHandler.java
@@ -131,8 +131,6 @@ public class DiscordTicketHandler extends ListenerAdapter {
 
     @Override
     public void onMessageReceived(@NotNull MessageReceivedEvent event) {
-        if (!event.isFromGuild()) return;
-
         MessageChannel channel = event.getChannel();
         if(
                 channel instanceof TextChannel textChannel &&