diff --git a/gradle.properties b/gradle.properties index 155e6cf..8ac88a8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = me.earthme.luminol version=1.21.4-R0.1-SNAPSHOT mcVersion=1.21.4 -foliaRef=d3969cdc419b84e2d94c13854d4eb94ae2e0b7be +foliaRef=29867414449cede8010bac42dc9bf31dd21eb278 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/luminol-server/paper-patches/features/0004-Add-tpsbar-with-chunkhot-membar-and-region-bar.patch b/luminol-server/paper-patches/features/0004-Add-tpsbar-with-chunkhot-membar-and-region-bar.patch index ce6e5b5..526793b 100644 --- a/luminol-server/paper-patches/features/0004-Add-tpsbar-with-chunkhot-membar-and-region-bar.patch +++ b/luminol-server/paper-patches/features/0004-Add-tpsbar-with-chunkhot-membar-and-region-bar.patch @@ -22,10 +22,10 @@ index de8b9048c8395c05b8688bc9d984b8ad680f15b3..f42692cd4f0154705c3d5b030d281cfc + // KioCG end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index c9afcd46f6a1b74b82ed68f1df6188369cf53a73..7cb95021f547c94eae7cef0bf5b2d8dff0a04937 100644 +index ac878520dc4aaa0e6a1ce8de0982d60a8397bc15..af20bc3b9cfb056beca0a341e209a4cc5e869da3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2404,6 +2404,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2401,6 +2401,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { handle.expToDrop = data.getInt("expToDrop"); handle.keepLevel = data.getBoolean("keepLevel"); } @@ -41,7 +41,7 @@ index c9afcd46f6a1b74b82ed68f1df6188369cf53a73..7cb95021f547c94eae7cef0bf5b2d8df } } -@@ -2425,6 +2434,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2422,6 +2431,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { data.putLong("lastPlayed", System.currentTimeMillis()); data.putString("lastKnownName", handle.getScoreboardName()); @@ -57,9 +57,9 @@ index c9afcd46f6a1b74b82ed68f1df6188369cf53a73..7cb95021f547c94eae7cef0bf5b2d8df // Paper start - persist for use in offline save data if (!nbttagcompound.contains("Paper")) { nbttagcompound.put("Paper", new CompoundTag()); -@@ -3618,4 +3636,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { - public void setDeathScreenScore(final int score) { - getHandle().setScore(score); +@@ -3631,4 +3649,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { + public void setSimplifyContainerDesyncCheck(final boolean simplifyContainerDesyncCheck) { + this.simplifyContainerDesyncCheck = simplifyContainerDesyncCheck; } + + // KioCG start - ChunkHot diff --git a/luminol-server/paper-patches/features/0007-SparklyPaper-Optimize-canSee-checks.patch b/luminol-server/paper-patches/features/0007-SparklyPaper-Optimize-canSee-checks.patch index 45dfece..6645db1 100644 --- a/luminol-server/paper-patches/features/0007-SparklyPaper-Optimize-canSee-checks.patch +++ b/luminol-server/paper-patches/features/0007-SparklyPaper-Optimize-canSee-checks.patch @@ -5,10 +5,10 @@ Subject: [PATCH] SparklyPaper Optimize canSee checks diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 7cb95021f547c94eae7cef0bf5b2d8dff0a04937..b80795605a61cb0d7aa9fa7eec960d9a13d8c030 100644 +index af20bc3b9cfb056beca0a341e209a4cc5e869da3..91dd18a874ea83bed83983ecfa52decce2b163a5 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -214,7 +214,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -210,7 +210,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { private boolean hasPlayedBefore = false; private final ConversationTracker conversationTracker = new ConversationTracker(); private final Set channels = new HashSet(); @@ -17,7 +17,7 @@ index 7cb95021f547c94eae7cef0bf5b2d8dff0a04937..b80795605a61cb0d7aa9fa7eec960d9a private final Set unlistedEntities = new HashSet<>(); // Paper - Add Listing API for Player private static final WeakHashMap> pluginWeakReferences = new WeakHashMap<>(); private int hash = 0; -@@ -2268,9 +2268,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2265,9 +2265,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public boolean canSee(org.bukkit.entity.Entity entity) {