Fixed Confirmation by implementing equals & hashcode methods

This commit is contained in:
Risto Lahtela 2020-08-30 22:31:11 +03:00
parent 33fb2c3011
commit 8939148f95
9 changed files with 130 additions and 0 deletions

View File

@ -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);
}
}

View File

@ -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);
}
}

View File

@ -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);
}
}

View File

@ -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);
}
}

View File

@ -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);
}
}

View File

@ -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);
}
}

View File

@ -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);
}
}

View File

@ -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);
}
}

View File

@ -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);
}
}