Update upstream

This commit is contained in:
Blast-Mc
2023-03-19 18:01:04 -04:00
parent 7646770baa
commit f8028c508e
33 changed files with 39 additions and 12 deletions

View File

@@ -0,0 +1,28 @@
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 eca5e6b93dd84307bf9dbadf32414d6f506e69dc..7e6b452df1915b1a6ebcc3bfd8f8ace5258fada4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1898,6 +1898,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
server.getPluginManager().callEvent(new PlayerShowEntityEvent(this, entity)); // Paper
}
// Paper start
+
+ // Parchment start
+ @Override
+ public Set<UUID> getHiddenEntities(Plugin plugin) {
+ return invertedVisibilityEntities.entrySet().stream()
+ .filter(entry -> entry.getValue().contains(CraftPlayer.getPluginWeakReference(plugin)))
+ .map(Map.Entry::getKey)
+ .collect(java.util.stream.Collectors.toSet());
+ }
+ // Parchment end
+
@Override
public void setPlayerProfile(com.destroystokyo.paper.profile.PlayerProfile profile) {
ServerPlayer self = this.getHandle();