mirror of
https://github.com/Samsuik/Sakura.git
synced 2025-12-28 03:09:07 +00:00
47ec0cbf05
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@88a3a87 Configurable xp orb merge group count (#12503) PaperMC/Paper@53d1d04 Disable Item Obfuscation for entity related stacks (#12297) PaperMC/Paper@c98cd65 Add configuration interface to expose certain config values (#12273) PaperMC/Paper@42a2a6c Supports the ability for commands to be registered internally (#12520) PaperMC/Paper@753cff7 Improvements for Dump paper commands (#12512) PaperMC/Paper@e2da5d2 Registry API for supported Mob Variants (#12417) PaperMC/Paper@ab0253f Expand PlayerDeathEvent API (#12221) PaperMC/Paper@cbcf75a Update visual fire handling with TriState support (#12303) PaperMC/Paper@6c3964d Properly save level data async (#12530) PaperMC/Paper@d2ad2e6 Add missing EntityLookup#getAllMapped from Moonrise PaperMC/Paper@358e72e Remove simplify remote item matching stuff for now PaperMC/Paper@04ffca0 Also remove CraftPlayer methods PaperMC/Paper@a252581 Update mache
48 lines
2.2 KiB
Diff
48 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 9615467faa2aeb6cd54a3f54ef519daed76194f4..ca3498b8b0a60d83321cdcfdb89a3ab6578f45d3 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -2374,6 +2374,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
handle.expToDrop = data.getIntOr("expToDrop", 0);
|
|
handle.keepLevel = data.getBooleanOr("keepLevel", false);
|
|
});
|
|
+ // Sakura start - client visibility settings; load from nbt
|
|
+ CompoundTag sakuraTag = tag.getCompoundOrEmpty("sakura");
|
|
+ this.getHandle().visibilitySettings.loadData(sakuraTag);
|
|
+ // Sakura end - client visibility settings; load from nbt
|
|
}
|
|
|
|
public void setExtraData(CompoundTag tag) {
|
|
@@ -2403,6 +2407,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 = tag.getCompoundOrEmpty("sakura");
|
|
+ this.getHandle().visibilitySettings.saveData(sakuraTag);
|
|
+ tag.put("sakura", sakuraTag);
|
|
+ // Sakura end - client visibility settings; save to nbt
|
|
}
|
|
|
|
@Override
|
|
@@ -3063,6 +3072,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() {
|