mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-20 23:49:31 +00:00
PaperPR: Fix BanList API
Fixing Plan plugin ClassCastException error
This commit is contained in:
Dreeam
116
patches/api/0008-PaperPR-Fix-BanList-API.patch
Normal file
116
patches/api/0008-PaperPR-Fix-BanList-API.patch
Normal file
@@ -0,0 +1,116 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||||||
|
Date: Tue, 4 Jul 2023 11:27:18 -0700
|
||||||
|
Subject: [PATCH] PaperPR: Fix BanList API
|
||||||
|
|
||||||
|
Original license: GPLv3
|
||||||
|
Original project: https://github.com/PaperMC/Paper
|
||||||
|
Paper pull request: https://github.com/PaperMC/Paper/pull/9450
|
||||||
|
|
||||||
|
diff --git a/src/main/java/org/bukkit/BanList.java b/src/main/java/org/bukkit/BanList.java
|
||||||
|
index c229d3bc37c4e454a4b5a93eda1fe6466a4f4e8b..adeff14586351edad412a85a5797c28a43aaa9de 100644
|
||||||
|
--- a/src/main/java/org/bukkit/BanList.java
|
||||||
|
+++ b/src/main/java/org/bukkit/BanList.java
|
||||||
|
@@ -46,7 +46,7 @@ public interface BanList<T> {
|
||||||
|
*/
|
||||||
|
@Deprecated
|
||||||
|
@Nullable
|
||||||
|
- public BanEntry<T> getBanEntry(@NotNull String target);
|
||||||
|
+ public <E extends BanEntry<? super T>> E getBanEntry(@NotNull String target); // Paper
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets a {@link BanEntry} by target.
|
||||||
|
@@ -75,7 +75,7 @@ public interface BanList<T> {
|
||||||
|
*/
|
||||||
|
@Deprecated
|
||||||
|
@Nullable
|
||||||
|
- public BanEntry<T> addBan(@NotNull String target, @Nullable String reason, @Nullable Date expires, @Nullable String source);
|
||||||
|
+ public <E extends BanEntry<? super T>> E addBan(@NotNull String target, @Nullable String reason, @Nullable Date expires, @Nullable String source); // Paper
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Adds a ban to this list. If a previous ban exists, this will
|
||||||
|
@@ -108,7 +108,7 @@ public interface BanList<T> {
|
||||||
|
* @return an immutable set containing every entry tracked by this list
|
||||||
|
*/
|
||||||
|
@NotNull
|
||||||
|
- public Set<BanEntry<T>> getEntries();
|
||||||
|
+ public <E extends BanEntry<? super T>> Set<E> getEntries(); // Paper
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets if a {@link BanEntry} exists for the target, indicating an active
|
||||||
|
diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
|
||||||
|
index 8cb7000bc5e4e3c987cb0ac73d113eedb141e178..e2c3271c4b7b8eb5ac14ffd1c4492a4d3c17123c 100644
|
||||||
|
--- a/src/main/java/org/bukkit/OfflinePlayer.java
|
||||||
|
+++ b/src/main/java/org/bukkit/OfflinePlayer.java
|
||||||
|
@@ -133,7 +133,7 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
|
||||||
|
* (updated) previous ban
|
||||||
|
*/
|
||||||
|
@Nullable
|
||||||
|
- public BanEntry<PlayerProfile> ban(@Nullable String reason, @Nullable Date expires, @Nullable String source);
|
||||||
|
+ public <E extends BanEntry<? super com.destroystokyo.paper.profile.PlayerProfile>> E ban(@Nullable String reason, @Nullable Date expires, @Nullable String source);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if this player is whitelisted or not
|
||||||
|
diff --git a/src/main/java/org/bukkit/ban/ProfileBanList.java b/src/main/java/org/bukkit/ban/ProfileBanList.java
|
||||||
|
index e805e629cede1c4c0674282c930cb67852718c3e..429b6e3730118660585c84319ef09e2e5bb32fd5 100644
|
||||||
|
--- a/src/main/java/org/bukkit/ban/ProfileBanList.java
|
||||||
|
+++ b/src/main/java/org/bukkit/ban/ProfileBanList.java
|
||||||
|
@@ -10,7 +10,7 @@ import org.jetbrains.annotations.Nullable;
|
||||||
|
/**
|
||||||
|
* A {@link BanList} targeting player profile bans.
|
||||||
|
*/
|
||||||
|
-public interface ProfileBanList extends BanList<PlayerProfile> {
|
||||||
|
+public interface ProfileBanList extends BanList<com.destroystokyo.paper.profile.PlayerProfile> { // Paper
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@inheritDoc}
|
||||||
|
@@ -23,8 +23,35 @@ public interface ProfileBanList extends BanList<PlayerProfile> {
|
||||||
|
* @return the entry for the newly created ban, or the entry for the
|
||||||
|
* (updated) previous ban
|
||||||
|
* @throws IllegalArgumentException if ProfilePlayer has an invalid UUID
|
||||||
|
+ * @deprecated use {@link #addBan(com.destroystokyo.paper.profile.PlayerProfile, String, Date, String)}
|
||||||
|
*/
|
||||||
|
@Nullable
|
||||||
|
- public BanEntry<PlayerProfile> addBan(@NotNull PlayerProfile target, @Nullable String reason, @Nullable Date expires, @Nullable String source);
|
||||||
|
+ // Paper start
|
||||||
|
+ @Deprecated
|
||||||
|
+ public <E extends BanEntry<? super com.destroystokyo.paper.profile.PlayerProfile>> E addBan(@NotNull PlayerProfile target, @Nullable String reason, @Nullable Date expires, @Nullable String source);
|
||||||
|
|
||||||
|
+ /**
|
||||||
|
+ * @throws IllegalArgumentException if ProfilePlayer has an invalid UUID
|
||||||
|
+ */
|
||||||
|
+ @Nullable BanEntry<com.destroystokyo.paper.profile.PlayerProfile> addBan(com.destroystokyo.paper.profile.@NotNull PlayerProfile target, @Nullable String reason, @Nullable Date expires, @Nullable String source);
|
||||||
|
+
|
||||||
|
+ // the 3 methods below are added to maintain compat for the PlayerProfile parameter type
|
||||||
|
+ /**
|
||||||
|
+ * @deprecated use {@link #getBanEntry(Object)}
|
||||||
|
+ */
|
||||||
|
+ @Deprecated
|
||||||
|
+ @Nullable <E extends BanEntry<? super com.destroystokyo.paper.profile.PlayerProfile>> E getBanEntry(@NotNull PlayerProfile target);
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * @deprecated use {@link #isBanned(Object)}
|
||||||
|
+ */
|
||||||
|
+ @Deprecated
|
||||||
|
+ boolean isBanned(@NotNull PlayerProfile target);
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * @deprecated use {@link #pardon(Object)}
|
||||||
|
+ */
|
||||||
|
+ @Deprecated
|
||||||
|
+ void pardon(@NotNull PlayerProfile target);
|
||||||
|
+ // Paper end
|
||||||
|
}
|
||||||
|
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||||
|
index cfef295eef8a893dd7337782f7d307791b4fa20b..b54fb79cdd2b4e112b22177d1b0499fb49467e92 100644
|
||||||
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||||
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||||
|
@@ -301,7 +301,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||||
|
* (updated) previous ban
|
||||||
|
*/
|
||||||
|
@Nullable
|
||||||
|
- public BanEntry<PlayerProfile> ban(@Nullable String reason, @Nullable Date expires, @Nullable String source, boolean kickPlayer);
|
||||||
|
+ public <E extends BanEntry<? super com.destroystokyo.paper.profile.PlayerProfile>> E ban(@Nullable String reason, @Nullable Date expires, @Nullable String source, boolean kickPlayer); // Paper
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Adds this user's current IP address to the {@link IpBanList}. If a previous ban exists, this will
|
||||||
197
patches/server/0032-PaperPR-Fix-BanList-API.patch
Normal file
197
patches/server/0032-PaperPR-Fix-BanList-API.patch
Normal file
@@ -0,0 +1,197 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||||||
|
Date: Tue, 4 Jul 2023 11:27:10 -0700
|
||||||
|
Subject: [PATCH] PaperPR: Fix BanList API
|
||||||
|
|
||||||
|
Original license: GPLv3
|
||||||
|
Original project: https://github.com/PaperMC/Paper
|
||||||
|
Paper pull request: https://github.com/PaperMC/Paper/pull/9450
|
||||||
|
|
||||||
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
|
||||||
|
index ce5d0f6b08f6c6f7272f53a939fa9c741637a628..a0edd8d92ec536ecbd8405aa222cf23cc99e46b2 100644
|
||||||
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
|
||||||
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
|
||||||
|
@@ -112,7 +112,7 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
- public BanEntry<PlayerProfile> ban(String reason, Date expires, String source) {
|
||||||
|
+ public BanEntry<com.destroystokyo.paper.profile.PlayerProfile> ban(String reason, Date expires, String source) { // Paper
|
||||||
|
return ((ProfileBanList) this.server.getBanList(BanList.Type.PROFILE)).addBan(this.getPlayerProfile(), reason, expires, source);
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/src/main/java/org/bukkit/craftbukkit/ban/CraftProfileBanEntry.java b/src/main/java/org/bukkit/craftbukkit/ban/CraftProfileBanEntry.java
|
||||||
|
index 13e5e44b069121e51b9486c445902937f1d6c6d8..4a37c8172b42b10472bb90c9310c7ae3eeaa3481 100644
|
||||||
|
--- a/src/main/java/org/bukkit/craftbukkit/ban/CraftProfileBanEntry.java
|
||||||
|
+++ b/src/main/java/org/bukkit/craftbukkit/ban/CraftProfileBanEntry.java
|
||||||
|
@@ -9,7 +9,7 @@ import org.bukkit.BanEntry;
|
||||||
|
import org.bukkit.craftbukkit.profile.CraftPlayerProfile;
|
||||||
|
import org.bukkit.profile.PlayerProfile;
|
||||||
|
|
||||||
|
-public final class CraftProfileBanEntry implements BanEntry<PlayerProfile> {
|
||||||
|
+public final class CraftProfileBanEntry implements BanEntry<com.destroystokyo.paper.profile.PlayerProfile> { // Paper
|
||||||
|
private static final Date minorDate = Date.from(Instant.parse("1899-12-31T04:00:00Z"));
|
||||||
|
private final UserBanList list;
|
||||||
|
private final GameProfile profile;
|
||||||
|
@@ -33,8 +33,8 @@ public final class CraftProfileBanEntry implements BanEntry<PlayerProfile> {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
- public PlayerProfile getBanTarget() {
|
||||||
|
- return new CraftPlayerProfile(this.profile);
|
||||||
|
+ public com.destroystokyo.paper.profile.PlayerProfile getBanTarget() { // Paper
|
||||||
|
+ return new com.destroystokyo.paper.profile.CraftPlayerProfile(this.profile); // Paper
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
diff --git a/src/main/java/org/bukkit/craftbukkit/ban/CraftProfileBanList.java b/src/main/java/org/bukkit/craftbukkit/ban/CraftProfileBanList.java
|
||||||
|
index b143b6a43da875caf938865a062e2f30019f7788..6b479a11cb15b7d1d468b2ea1eff547b9e5661de 100644
|
||||||
|
--- a/src/main/java/org/bukkit/craftbukkit/ban/CraftProfileBanList.java
|
||||||
|
+++ b/src/main/java/org/bukkit/craftbukkit/ban/CraftProfileBanList.java
|
||||||
|
@@ -22,32 +22,58 @@ public class CraftProfileBanList implements ProfileBanList {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
- public BanEntry<PlayerProfile> getBanEntry(String target) {
|
||||||
|
+ public BanEntry<com.destroystokyo.paper.profile.PlayerProfile> getBanEntry(String target) { // Paper
|
||||||
|
Preconditions.checkArgument(target != null, "Target cannot be null");
|
||||||
|
|
||||||
|
return this.getBanEntry(CraftProfileBanList.getProfile(target));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
- public BanEntry<PlayerProfile> getBanEntry(PlayerProfile target) {
|
||||||
|
+ public BanEntry<com.destroystokyo.paper.profile.PlayerProfile> getBanEntry(PlayerProfile target) { // Paper
|
||||||
|
Preconditions.checkArgument(target != null, "Target cannot be null");
|
||||||
|
|
||||||
|
- return this.getBanEntry(((CraftPlayerProfile) target).buildGameProfile());
|
||||||
|
+ return this.getBanEntry(((com.destroystokyo.paper.profile.SharedPlayerProfile) target).buildGameProfile()); // Paper
|
||||||
|
+ }
|
||||||
|
+ // Paper start
|
||||||
|
+ @Override
|
||||||
|
+ public BanEntry<com.destroystokyo.paper.profile.PlayerProfile> getBanEntry(final com.destroystokyo.paper.profile.PlayerProfile target) {
|
||||||
|
+ Preconditions.checkArgument(target != null, "target cannot be null");
|
||||||
|
+
|
||||||
|
+ return this.getBanEntry(((com.destroystokyo.paper.profile.SharedPlayerProfile) target).buildGameProfile());
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public BanEntry<com.destroystokyo.paper.profile.PlayerProfile> addBan(final com.destroystokyo.paper.profile.PlayerProfile target, final String reason, final Date expires, final String source) {
|
||||||
|
+ Preconditions.checkArgument(target != null, "PlayerProfile cannot be null");
|
||||||
|
+ Preconditions.checkArgument(target.getId() != null, "The PlayerProfile UUID cannot be null");
|
||||||
|
+
|
||||||
|
+ return this.addBan(((com.destroystokyo.paper.profile.SharedPlayerProfile) target).buildGameProfile(), reason, expires, source);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
- public BanEntry<PlayerProfile> addBan(String target, String reason, Date expires, String source) {
|
||||||
|
+ public boolean isBanned(final com.destroystokyo.paper.profile.PlayerProfile target) {
|
||||||
|
+ return this.isBanned((com.destroystokyo.paper.profile.SharedPlayerProfile) target);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public void pardon(final com.destroystokyo.paper.profile.PlayerProfile target) {
|
||||||
|
+ this.pardon((com.destroystokyo.paper.profile.SharedPlayerProfile) target);
|
||||||
|
+ }
|
||||||
|
+ // Paper end
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public BanEntry<com.destroystokyo.paper.profile.PlayerProfile> addBan(String target, String reason, Date expires, String source) { // Paper
|
||||||
|
Preconditions.checkArgument(target != null, "Ban target cannot be null");
|
||||||
|
|
||||||
|
return this.addBan(CraftProfileBanList.getProfileByName(target), reason, expires, source);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
- public BanEntry<PlayerProfile> addBan(PlayerProfile target, String reason, Date expires, String source) {
|
||||||
|
+ public BanEntry<com.destroystokyo.paper.profile.PlayerProfile> addBan(PlayerProfile target, String reason, Date expires, String source) { // Paper
|
||||||
|
Preconditions.checkArgument(target != null, "PlayerProfile cannot be null");
|
||||||
|
Preconditions.checkArgument(target.getUniqueId() != null, "The PlayerProfile UUID cannot be null");
|
||||||
|
|
||||||
|
- return this.addBan(((CraftPlayerProfile) target).buildGameProfile(), reason, expires, source);
|
||||||
|
+ return this.addBan(((com.destroystokyo.paper.profile.SharedPlayerProfile) target).buildGameProfile(), reason, expires, source); // Paper
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@@ -62,8 +88,8 @@ public class CraftProfileBanList implements ProfileBanList {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
- public Set<BanEntry<PlayerProfile>> getEntries() {
|
||||||
|
- ImmutableSet.Builder<BanEntry<PlayerProfile>> builder = ImmutableSet.builder();
|
||||||
|
+ public Set<BanEntry<com.destroystokyo.paper.profile.PlayerProfile>> getEntries() { // Paper
|
||||||
|
+ ImmutableSet.Builder<BanEntry<com.destroystokyo.paper.profile.PlayerProfile>> builder = ImmutableSet.builder(); // Paper
|
||||||
|
for (UserBanListEntry entry : this.list.getEntries()) {
|
||||||
|
GameProfile profile = entry.getUser();
|
||||||
|
builder.add(new CraftProfileBanEntry(profile, entry, this.list));
|
||||||
|
@@ -74,9 +100,14 @@ public class CraftProfileBanList implements ProfileBanList {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isBanned(PlayerProfile target) {
|
||||||
|
+ // Paper start
|
||||||
|
+ return this.isBanned((com.destroystokyo.paper.profile.SharedPlayerProfile) target);
|
||||||
|
+ }
|
||||||
|
+ private boolean isBanned(com.destroystokyo.paper.profile.SharedPlayerProfile target) {
|
||||||
|
+ // Paper end
|
||||||
|
Preconditions.checkArgument(target != null, "Target cannot be null");
|
||||||
|
|
||||||
|
- return this.isBanned(((CraftPlayerProfile) target).buildGameProfile());
|
||||||
|
+ return this.isBanned(target.buildGameProfile()); // Paper
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@@ -88,9 +119,14 @@ public class CraftProfileBanList implements ProfileBanList {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void pardon(PlayerProfile target) {
|
||||||
|
+ // Paper start
|
||||||
|
+ this.pardon((com.destroystokyo.paper.profile.SharedPlayerProfile) target);
|
||||||
|
+ }
|
||||||
|
+ private void pardon(com.destroystokyo.paper.profile.SharedPlayerProfile target) {
|
||||||
|
+ // Paper end
|
||||||
|
Preconditions.checkArgument(target != null, "Target cannot be null");
|
||||||
|
|
||||||
|
- this.pardon(((CraftPlayerProfile) target).buildGameProfile());
|
||||||
|
+ this.pardon(target.buildGameProfile()); // Paper
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@@ -100,7 +136,7 @@ public class CraftProfileBanList implements ProfileBanList {
|
||||||
|
this.pardon(CraftProfileBanList.getProfile(target));
|
||||||
|
}
|
||||||
|
|
||||||
|
- public BanEntry<PlayerProfile> getBanEntry(GameProfile profile) {
|
||||||
|
+ public BanEntry<com.destroystokyo.paper.profile.PlayerProfile> getBanEntry(GameProfile profile) { // Paper
|
||||||
|
if (profile == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
@@ -113,7 +149,7 @@ public class CraftProfileBanList implements ProfileBanList {
|
||||||
|
return new CraftProfileBanEntry(profile, entry, this.list);
|
||||||
|
}
|
||||||
|
|
||||||
|
- public BanEntry<PlayerProfile> addBan(GameProfile profile, String reason, Date expires, String source) {
|
||||||
|
+ public BanEntry<com.destroystokyo.paper.profile.PlayerProfile> addBan(GameProfile profile, String reason, Date expires, String source) { // Paper
|
||||||
|
if (profile == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
|
index b0aacaf732c5c54255d299e0b3aef6bd0c0a6c05..e35b28d42dd34f00576efec526661817389a4b0c 100644
|
||||||
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
|
@@ -1656,13 +1656,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
- public BanEntry<PlayerProfile> ban(String reason, Date expires, String source) {
|
||||||
|
+ public BanEntry<com.destroystokyo.paper.profile.PlayerProfile> ban(String reason, Date expires, String source) { // Paper
|
||||||
|
return this.ban(reason, expires, source, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
- public BanEntry<PlayerProfile> ban(String reason, Date expires, String source, boolean kickPlayer) {
|
||||||
|
- BanEntry<PlayerProfile> banEntry = ((ProfileBanList) server.getBanList(BanList.Type.PROFILE)).addBan(this.getPlayerProfile(), reason, expires, source);
|
||||||
|
+ public BanEntry<com.destroystokyo.paper.profile.PlayerProfile> ban(String reason, Date expires, String source, boolean kickPlayer) { // Paper
|
||||||
|
+ BanEntry<com.destroystokyo.paper.profile.PlayerProfile> banEntry = ((ProfileBanList) server.getBanList(BanList.Type.PROFILE)).addBan(this.getPlayerProfile(), reason, expires, source); // Paper
|
||||||
|
if (kickPlayer) {
|
||||||
|
this.kickPlayer(reason);
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user