From 8939148f955a9dbc8b53a610db61ded6908b688c Mon Sep 17 00:00:00 2001 From: Risto Lahtela <24460436+Rsl1122@users.noreply.github.com> Date: Sun, 30 Aug 2020 22:31:11 +0300 Subject: [PATCH] Fixed Confirmation by implementing equals & hashcode methods --- .../plan/commands/use/BukkitCMDSender.java | 14 ++++++++++++++ .../plan/commands/use/BukkitPlayerCMDSender.java | 15 +++++++++++++++ .../plan/command/use/BungeeCMDSender.java | 14 ++++++++++++++ .../plan/command/use/BungeePlayerCMDSender.java | 15 +++++++++++++++ .../plan/commands/use/NukkitCMDSender.java | 14 ++++++++++++++ .../plan/commands/use/NukkitPlayerCMDSender.java | 15 +++++++++++++++ .../plan/commands/use/SpongeCMDSender.java | 14 ++++++++++++++ .../plan/commands/use/VelocityCMDSender.java | 14 ++++++++++++++ .../commands/use/VelocityPlayerCMDSender.java | 15 +++++++++++++++ 9 files changed, 130 insertions(+) diff --git a/Plan/bukkit/src/main/java/com/djrapitops/plan/commands/use/BukkitCMDSender.java b/Plan/bukkit/src/main/java/com/djrapitops/plan/commands/use/BukkitCMDSender.java index 3be5c3ffe..36f869068 100644 --- a/Plan/bukkit/src/main/java/com/djrapitops/plan/commands/use/BukkitCMDSender.java +++ b/Plan/bukkit/src/main/java/com/djrapitops/plan/commands/use/BukkitCMDSender.java @@ -18,6 +18,7 @@ package com.djrapitops.plan.commands.use; import org.bukkit.command.CommandSender; +import java.util.Objects; import java.util.Optional; import java.util.UUID; @@ -58,4 +59,17 @@ public class BukkitCMDSender implements CMDSender { public ChatFormatter getFormatter() { return new ConsoleChatFormatter(); } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + BukkitCMDSender that = (BukkitCMDSender) o; + return sender.equals(that.sender); + } + + @Override + public int hashCode() { + return Objects.hash(sender); + } } diff --git a/Plan/bukkit/src/main/java/com/djrapitops/plan/commands/use/BukkitPlayerCMDSender.java b/Plan/bukkit/src/main/java/com/djrapitops/plan/commands/use/BukkitPlayerCMDSender.java index 40f20e3ac..892e0ad4b 100644 --- a/Plan/bukkit/src/main/java/com/djrapitops/plan/commands/use/BukkitPlayerCMDSender.java +++ b/Plan/bukkit/src/main/java/com/djrapitops/plan/commands/use/BukkitPlayerCMDSender.java @@ -18,6 +18,7 @@ package com.djrapitops.plan.commands.use; import org.bukkit.entity.Player; +import java.util.Objects; import java.util.Optional; import java.util.UUID; @@ -54,4 +55,18 @@ public class BukkitPlayerCMDSender extends BukkitCMDSender { public boolean supportsChatEvents() { return true; } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + if (!super.equals(o)) return false; + BukkitPlayerCMDSender that = (BukkitPlayerCMDSender) o; + return player.equals(that.player); + } + + @Override + public int hashCode() { + return Objects.hash(super.hashCode(), player); + } } diff --git a/Plan/bungeecord/src/main/java/com/djrapitops/plan/command/use/BungeeCMDSender.java b/Plan/bungeecord/src/main/java/com/djrapitops/plan/command/use/BungeeCMDSender.java index 380637e89..0e2a150f1 100644 --- a/Plan/bungeecord/src/main/java/com/djrapitops/plan/command/use/BungeeCMDSender.java +++ b/Plan/bungeecord/src/main/java/com/djrapitops/plan/command/use/BungeeCMDSender.java @@ -23,6 +23,7 @@ import com.djrapitops.plan.commands.use.MessageBuilder; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.chat.TextComponent; +import java.util.Objects; import java.util.Optional; import java.util.UUID; @@ -63,4 +64,17 @@ public class BungeeCMDSender implements CMDSender { public ChatFormatter getFormatter() { return new ConsoleChatFormatter(); } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + BungeeCMDSender that = (BungeeCMDSender) o; + return sender.equals(that.sender); + } + + @Override + public int hashCode() { + return Objects.hash(sender); + } } diff --git a/Plan/bungeecord/src/main/java/com/djrapitops/plan/command/use/BungeePlayerCMDSender.java b/Plan/bungeecord/src/main/java/com/djrapitops/plan/command/use/BungeePlayerCMDSender.java index c4b5dfbc7..bd05a6d59 100644 --- a/Plan/bungeecord/src/main/java/com/djrapitops/plan/command/use/BungeePlayerCMDSender.java +++ b/Plan/bungeecord/src/main/java/com/djrapitops/plan/command/use/BungeePlayerCMDSender.java @@ -20,6 +20,7 @@ import com.djrapitops.plan.commands.use.ChatFormatter; import com.djrapitops.plan.commands.use.PlayerChatFormatter; import net.md_5.bungee.api.connection.ProxiedPlayer; +import java.util.Objects; import java.util.Optional; import java.util.UUID; @@ -52,4 +53,18 @@ public class BungeePlayerCMDSender extends BungeeCMDSender { public boolean supportsChatEvents() { return true; } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + if (!super.equals(o)) return false; + BungeePlayerCMDSender that = (BungeePlayerCMDSender) o; + return player.equals(that.player); + } + + @Override + public int hashCode() { + return Objects.hash(super.hashCode(), player); + } } diff --git a/Plan/nukkit/src/main/java/com/djrapitops/plan/commands/use/NukkitCMDSender.java b/Plan/nukkit/src/main/java/com/djrapitops/plan/commands/use/NukkitCMDSender.java index 7738fa25c..5c64d0bf4 100644 --- a/Plan/nukkit/src/main/java/com/djrapitops/plan/commands/use/NukkitCMDSender.java +++ b/Plan/nukkit/src/main/java/com/djrapitops/plan/commands/use/NukkitCMDSender.java @@ -18,6 +18,7 @@ package com.djrapitops.plan.commands.use; import cn.nukkit.command.CommandSender; +import java.util.Objects; import java.util.Optional; import java.util.UUID; @@ -58,4 +59,17 @@ public class NukkitCMDSender implements CMDSender { public ChatFormatter getFormatter() { return new ConsoleChatFormatter(); } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + NukkitCMDSender that = (NukkitCMDSender) o; + return sender.equals(that.sender); + } + + @Override + public int hashCode() { + return Objects.hash(sender); + } } diff --git a/Plan/nukkit/src/main/java/com/djrapitops/plan/commands/use/NukkitPlayerCMDSender.java b/Plan/nukkit/src/main/java/com/djrapitops/plan/commands/use/NukkitPlayerCMDSender.java index 6b4f46edc..7c09a3980 100644 --- a/Plan/nukkit/src/main/java/com/djrapitops/plan/commands/use/NukkitPlayerCMDSender.java +++ b/Plan/nukkit/src/main/java/com/djrapitops/plan/commands/use/NukkitPlayerCMDSender.java @@ -18,6 +18,7 @@ package com.djrapitops.plan.commands.use; import cn.nukkit.Player; +import java.util.Objects; import java.util.Optional; import java.util.UUID; @@ -44,4 +45,18 @@ public class NukkitPlayerCMDSender extends NukkitCMDSender { public ChatFormatter getFormatter() { return new PlayerChatFormatter(); } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + if (!super.equals(o)) return false; + NukkitPlayerCMDSender that = (NukkitPlayerCMDSender) o; + return player.equals(that.player); + } + + @Override + public int hashCode() { + return Objects.hash(super.hashCode(), player); + } } diff --git a/Plan/sponge/src/main/java/com/djrapitops/plan/commands/use/SpongeCMDSender.java b/Plan/sponge/src/main/java/com/djrapitops/plan/commands/use/SpongeCMDSender.java index 8c030fac6..967feb631 100644 --- a/Plan/sponge/src/main/java/com/djrapitops/plan/commands/use/SpongeCMDSender.java +++ b/Plan/sponge/src/main/java/com/djrapitops/plan/commands/use/SpongeCMDSender.java @@ -19,6 +19,7 @@ package com.djrapitops.plan.commands.use; import org.spongepowered.api.command.CommandSource; import org.spongepowered.api.text.Text; +import java.util.Objects; import java.util.Optional; import java.util.UUID; @@ -59,4 +60,17 @@ public class SpongeCMDSender implements CMDSender { public ChatFormatter getFormatter() { return new ConsoleChatFormatter(); } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + SpongeCMDSender that = (SpongeCMDSender) o; + return source.equals(that.source); + } + + @Override + public int hashCode() { + return Objects.hash(source); + } } diff --git a/Plan/velocity/src/main/java/com/djrapitops/plan/commands/use/VelocityCMDSender.java b/Plan/velocity/src/main/java/com/djrapitops/plan/commands/use/VelocityCMDSender.java index 1921af682..4b195ed08 100644 --- a/Plan/velocity/src/main/java/com/djrapitops/plan/commands/use/VelocityCMDSender.java +++ b/Plan/velocity/src/main/java/com/djrapitops/plan/commands/use/VelocityCMDSender.java @@ -19,6 +19,7 @@ package com.djrapitops.plan.commands.use; import com.velocitypowered.api.command.CommandSource; import net.kyori.text.TextComponent; +import java.util.Objects; import java.util.Optional; import java.util.UUID; @@ -59,4 +60,17 @@ public class VelocityCMDSender implements CMDSender { public ChatFormatter getFormatter() { return new ConsoleChatFormatter(); } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + VelocityCMDSender that = (VelocityCMDSender) o; + return commandSource.equals(that.commandSource); + } + + @Override + public int hashCode() { + return Objects.hash(commandSource); + } } diff --git a/Plan/velocity/src/main/java/com/djrapitops/plan/commands/use/VelocityPlayerCMDSender.java b/Plan/velocity/src/main/java/com/djrapitops/plan/commands/use/VelocityPlayerCMDSender.java index 26c7daa45..edeab08c0 100644 --- a/Plan/velocity/src/main/java/com/djrapitops/plan/commands/use/VelocityPlayerCMDSender.java +++ b/Plan/velocity/src/main/java/com/djrapitops/plan/commands/use/VelocityPlayerCMDSender.java @@ -18,6 +18,7 @@ package com.djrapitops.plan.commands.use; import com.velocitypowered.api.proxy.Player; +import java.util.Objects; import java.util.Optional; import java.util.UUID; @@ -50,4 +51,18 @@ public class VelocityPlayerCMDSender extends VelocityCMDSender { public boolean supportsChatEvents() { return true; } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + if (!super.equals(o)) return false; + VelocityPlayerCMDSender that = (VelocityPlayerCMDSender) o; + return player.equals(that.player); + } + + @Override + public int hashCode() { + return Objects.hash(super.hashCode(), player); + } }