From d7ac3c7f78118a0bd23e341ddb2ba96a7d410c50 Mon Sep 17 00:00:00 2001 From: MC_XiaoHei Date: Thu, 29 Aug 2024 16:05:44 +0800 Subject: [PATCH] fix: remove wrong api --- .../server/0057-Implementation-Carpet-features.patch | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/patches/server/0057-Implementation-Carpet-features.patch b/patches/server/0057-Implementation-Carpet-features.patch index 22c9d86..af4c9f9 100644 --- a/patches/server/0057-Implementation-Carpet-features.patch +++ b/patches/server/0057-Implementation-Carpet-features.patch @@ -3334,7 +3334,7 @@ index a6bc5c5053f1fce822166d0cd1ea67dc490dc0af..57737218697f90c55b3e8a87f1c4ac5b public CollectingNeighborUpdater(Level world, int maxChainDepth) { this.level = world; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index b586912ec67ea6708e0df260adc7c949e87a2075..59daeab40d7404e86034f4614cffc75797ef54a2 100644 +index b586912ec67ea6708e0df260adc7c949e87a2075..2be07f8c48a08ebe9d49d1110043eebed2e2ef42 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -22,19 +22,7 @@ import java.io.FileNotFoundException; @@ -3398,23 +3398,15 @@ index b586912ec67ea6708e0df260adc7c949e87a2075..59daeab40d7404e86034f4614cffc757 this.serverVersion = io.papermc.paper.ServerBuildInfo.buildInfo().asString(io.papermc.paper.ServerBuildInfo.StringRepresentation.VERSION_SIMPLE); // Paper - improve version this.structureManager = new CraftStructureManager(console.getStructureManager(), console.registryAccess()); this.dataPackManager = new CraftDataPackManager(this.getServer().getPackRepository()); -@@ -660,8 +657,15 @@ public final class CraftServer implements Server { +@@ -660,7 +657,7 @@ public final class CraftServer implements Server { @Override public List getOnlinePlayers() { - return this.playerView; + return this.playerView.get(org.leavesmc.lumina.utils.PlayerType.REAL); -+ } -+ -+ // Lumina start - player type -+ @Override -+ public Collection getOnlinePlayers(@NotNull org.leavesmc.lumina.utils.PlayerType playerType) { -+ return this.playerView.get(playerType); } -+ // Lumina end - player type @Override - @Deprecated diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index 843f24b0de5b9e80db420541699ddaf04dd56aa3..a5816f40bde921372dfdb2d6c7949dbdae884b02 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java