As promised, Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@22ac7d6 Add internal netty pipeline events PaperMC/Paper@345a6a6 Updated Upstream (CraftBukkit) PaperMC/Paper@86f87ba Fix custom merchant trade event world reference PaperMC/Paper@734a436 Move patches over, start with first few PaperMC/Paper@faafca8 New work PaperMC/Paper@afb9e81 Fix timings diff PaperMC/Paper@08828fd More work PaperMC/Paper@50710fa More more work PaperMC/Paper@7a13367 More more more work PaperMC/Paper@aab4038 More more more more work PaperMC/Paper@c730403 More more more more work PaperMC/Paper@6b80b34 More more more more more more work PaperMC/Paper@c8f3d9e More more more more more more more work PaperMC/Paper@64cb313 some compile fixes PaperMC/Paper@063e6b2 Compile fixes PaperMC/Paper@cb6f029 More compile fixed PaperMC/Paper@d41ecbe Make it compie PaperMC/Paper@2184cd2 Fix chat message api using overlay PaperMC/Paper@c488d15 Don't fire preview event for non-player senders PaperMC/Paper@71544ab Readd deobfuscation of chat executor stacktraces PaperMC/Paper@4a4ee79 Separate out chat and commands sent via API (#8131) PaperMC/Paper@2acb479 Fix xray patch code style (#8196) PaperMC/Paper@3b895f3 Updated Upstream (CraftBukkit) PaperMC/Paper@e5bbb56 Added 1.19 kick event causes (#8204) PaperMC/Paper@b72eafc Send block entities after destroy prediction (#8053) PaperMC/Paper@b74c4d4 Warn on plugins accessing faraway chunks (#8208) PaperMC/Paper@65f0b2e Add more needed BlockStateListPopulator Methods (#8021) PaperMC/Paper@8a08b86 Custom Chat Completions API (#8212) PaperMC/Paper@6ecdbc0 Use Worldheight for Activation Ranges (#8061) PaperMC/Paper@532dc51 Add missing BlockFadeEvents (#8171)
29 lines
1.3 KiB
Diff
29 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Lexi <lexi@qixils.dev>
|
|
Date: Thu, 23 Jun 2022 22:03:18 -0400
|
|
Subject: [PATCH] Add Player#getHiddenEntities API
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
index ef9c3a7b15a4901e1662e6d55504b9cbbb804ad3..21a5f34e12af4435982c73fb48c7c9f679c364a6 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -1794,6 +1794,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
registerEntity(player);
|
|
}
|
|
}
|
|
+
|
|
+ // Parchment start
|
|
+ @Override
|
|
+ public Set<UUID> getHiddenEntities(Plugin plugin) {
|
|
+ return hiddenEntities.entrySet().stream()
|
|
+ .filter(entry -> entry.getValue().contains(CraftPlayer.getPluginWeakReference(plugin)))
|
|
+ .map(Map.Entry::getKey)
|
|
+ .collect(java.util.stream.Collectors.toSet());
|
|
+ }
|
|
+ // Parchment end
|
|
+
|
|
public void setPlayerProfile(com.destroystokyo.paper.profile.PlayerProfile profile) {
|
|
ServerPlayer self = getHandle();
|
|
self.gameProfile = com.destroystokyo.paper.profile.CraftPlayerProfile.asAuthlibCopy(profile);
|