twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-09 16:42:03 -07:00
Code Issues Packages Projects Releases Wiki Activity

temporarily revert OldEnum toString changes (#11829)

Browse Source
This commit is contained in:
Jake Potrebic
2024-12-26 10:11:18 -08:00
committed by GitHub
parent c9a904ed17
commit a8f850a128
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
paper-server/src/main/java/io/papermc/paper/util/OldEnumHolderable.java
View File

@@ -9,7 +9,7 @@ import org.bukkit.util.OldEnum;
import org.jspecify.annotations.NullMarked; import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable; import org.jspecify.annotations.Nullable;
@SuppressWarnings("removal") @SuppressWarnings({"removal", "DeprecatedIsStillUsed"})
@Deprecated @Deprecated
@NullMarked @NullMarked
public abstract class OldEnumHolderable<A extends OldEnum<A>, M> implements Holderable<M>, OldEnum<A>, Keyed { public abstract class OldEnumHolderable<A extends OldEnum<A>, M> implements Holderable<M>, OldEnum<A>, Keyed {
@@ -43,7 +43,7 @@ public abstract class OldEnumHolderable<A extends OldEnum<A>, M> implements Hold
@Override @Override
@Deprecated @Deprecated
public int compareTo(A other) { public int compareTo(final A other) {
this.checkIsReference(); this.checkIsReference();
return this.ordinal - other.ordinal(); return this.ordinal - other.ordinal();
} }
@@ -83,6 +83,10 @@ public abstract class OldEnumHolderable<A extends OldEnum<A>, M> implements Hold
@Override @Override
public String toString() { public String toString() {
if (this.name != null) {
// TODO remove in next feature release or 1.22
return this.name;
}
return this.implToString(); return this.implToString();
} }
} }