mirror of
https://github.com/Samsuik/Sakura.git
synced 2026-01-04 15:31:43 +00:00
240a18f319
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@3af5e77 Add Player#give (#11995) PaperMC/Paper@7e21cb8 fix PlayerChangedMainHandEvent javadoc (#12020) PaperMC/Paper@5a34bf0 Correctly retrun true for empty input shapes in EntityGetter#isUnobstructed PaperMC/Paper@a392d47 Make Watchdog thread extend TickThread PaperMC/Paper@1004374 Add further information to thread check errors PaperMC/Paper@e2f0efd Remove nms.Entity#isChunkLoaded PaperMC/Paper@54b2e9d Add buffer to CraftWorld#warnUnsafeChunk PaperMC/Paper@d4a9578 Experimental annotation changes (#12028) PaperMC/Paper@5bcfb12 Fix activation range config and water animal status (#12047) PaperMC/Paper@e0711af Deprecate UnsafeValues#getSpawnEggLayerColor (#12041) PaperMC/Paper@8927091 Do not record movement for vehicles/players unaffected by blocks PaperMC/Paper@5395ae3 Fix composter block setting bukkit owner twice (#12058)
51 lines
2.2 KiB
Diff
51 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Samsuik <kfian294ma4@gmail.com>
|
|
Date: Tue, 21 Sep 2021 23:54:25 +0100
|
|
Subject: [PATCH] Client Visibility Settings
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
index 7ef1df9c0b3e2226a08aa4e820318402bee77a67..67c6c6cb96a8aace48165233923b97fcae907b4c 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -2404,6 +2404,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
handle.keepLevel = data.getBoolean("keepLevel");
|
|
}
|
|
}
|
|
+
|
|
+ // Sakura start - client visibility settings; load from nbt
|
|
+ if (nbttagcompound.contains("sakura", 10)) {
|
|
+ CompoundTag sakuraTag = nbttagcompound.getCompound("sakura");
|
|
+ this.getHandle().visibilitySettings.loadData(sakuraTag);
|
|
+ }
|
|
+ // Sakura end - client visibility settings; load from nbt
|
|
}
|
|
|
|
public void setExtraData(CompoundTag nbttagcompound) {
|
|
@@ -2433,6 +2440,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
paper.putLong("LastLogin", handle.loginTime);
|
|
paper.putLong("LastSeen", System.currentTimeMillis());
|
|
// Paper end
|
|
+ // Sakura start - client visibility settings; save to nbt
|
|
+ CompoundTag sakuraTag = nbttagcompound.getCompound("sakura");
|
|
+ this.getHandle().visibilitySettings.saveData(sakuraTag);
|
|
+ nbttagcompound.put("sakura", sakuraTag);
|
|
+ // Sakura end - client visibility settings; save to nbt
|
|
}
|
|
|
|
@Override
|
|
@@ -3094,6 +3106,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
return this.getHandle().allowsListing();
|
|
}
|
|
|
|
+ // Sakura start - client visibility settings; api
|
|
+ @Override
|
|
+ public final me.samsuik.sakura.player.visibility.VisibilitySettings getVisibility() {
|
|
+ return this.getHandle().visibilitySettings;
|
|
+ }
|
|
+ // Sakura end - client visibility settings; api
|
|
+
|
|
// Paper start
|
|
@Override
|
|
public net.kyori.adventure.text.Component displayName() {
|