Repo-Mirror/eco
9
0
Fork 0
Code Issues Releases 2 Activity

Fixed placeholder equality

Browse Source
This commit is contained in:
Auxilor
2022-03-11 08:58:58 +00:00
parent 614241a058
commit 2f4783f13e
3 changed files with 56 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
eco-api/src/main/java/com/willfp/eco/core/placeholder/PlayerPlaceholder.java
View File

@@ -4,7 +4,9 @@ import com.willfp.eco.core.EcoPlugin;
import com.willfp.eco.core.integrations.placeholder.PlaceholderManager;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Objects;
import java.util.function.Function;
/**
@@ -70,4 +72,21 @@ public final class PlayerPlaceholder implements Placeholder {
public String getIdentifier() {
return this.identifier;
}
@Override
public boolean equals(@Nullable final Object o) {
if (this == o) {
return true;
}
if (!(o instanceof StaticPlaceholder that)) {
return false;
}
return Objects.equals(this.getIdentifier(), that.getIdentifier())
&& Objects.equals(this.getPlugin(), that.getPlugin());
}
@Override
public int hashCode() {
return Objects.hash(this.getIdentifier(), this.getPlugin());
}
}

19
eco-api/src/main/java/com/willfp/eco/core/placeholder/PlayerlessPlaceholder.java
View File

@@ -3,7 +3,9 @@ package com.willfp.eco.core.placeholder;
import com.willfp.eco.core.EcoPlugin;
import com.willfp.eco.core.integrations.placeholder.PlaceholderManager;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Objects;
import java.util.function.Supplier;
/**
@@ -68,4 +70,21 @@ public final class PlayerlessPlaceholder implements Placeholder {
public String getIdentifier() {
return this.identifier;
}
@Override
public boolean equals(@Nullable final Object o) {
if (this == o) {
return true;
}
if (!(o instanceof StaticPlaceholder that)) {
return false;
}
return Objects.equals(this.getIdentifier(), that.getIdentifier())
&& Objects.equals(this.getPlugin(), that.getPlugin());
}
@Override
public int hashCode() {
return Objects.hash(this.getIdentifier(), this.getPlugin());
}
}

18
eco-api/src/main/java/com/willfp/eco/core/placeholder/StaticPlaceholder.java
View File

@@ -3,7 +3,9 @@ package com.willfp.eco.core.placeholder;
import com.willfp.eco.core.Eco;
import com.willfp.eco.core.EcoPlugin;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Objects;
import java.util.function.Supplier;
/**
@@ -50,4 +52,20 @@ public final class StaticPlaceholder implements Placeholder {
public String getIdentifier() {
return this.identifier;
}
@Override
public boolean equals(@Nullable final Object o) {
if (this == o) {
return true;
}
if (!(o instanceof StaticPlaceholder that)) {
return false;
}
return Objects.equals(this.getIdentifier(), that.getIdentifier());
}
@Override
public int hashCode() {
return Objects.hash(this.getIdentifier());
}
}