diff --git a/gradle.properties b/gradle.properties index a5c52a0..155e6cf 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=d4cf71c327956e374a1e379535f9c47fb0ffc94a +foliaRef=d3969cdc419b84e2d94c13854d4eb94ae2e0b7be org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/luminol-api/paper-patches/features/0002-KioCG-Chunk-API.patch b/luminol-api/paper-patches/features/0002-KioCG-Chunk-API.patch index 75416c9..360b181 100644 --- a/luminol-api/paper-patches/features/0002-KioCG-Chunk-API.patch +++ b/luminol-api/paper-patches/features/0002-KioCG-Chunk-API.patch @@ -16,13 +16,13 @@ index d434277342b2db19f98e032d3a316b27d728b840..e188353ad193f6203533790ae52fafc0 + long getChunkHotAvg(); // KioCG } diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 0081dd53b6a81ce7892e58d61f9f8a6718e30775..28fbd8df491a4c562de7530e88706e9c88460483 100644 +index 494dca2ee48a03953d47050b178496df12bc48c5..a65d64b1ef64cf1cf213cec00e7f73cc7ad2b79c 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3902,4 +3902,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM - * @return the result of this method, holding leftovers and spawned items. +@@ -3918,4 +3918,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM + * @param score New death screen score of player */ - PlayerGiveResult give(Collection items, boolean dropIfFull); + void setDeathScreenScore(int score); + + long getNearbyChunkHot(); // KioCG } diff --git a/luminol-api/paper-patches/features/0007-Tick-regions-api.patch b/luminol-api/paper-patches/features/0007-Tick-regions-api.patch index 0a36040..2e8c5ec 100644 --- a/luminol-api/paper-patches/features/0007-Tick-regions-api.patch +++ b/luminol-api/paper-patches/features/0007-Tick-regions-api.patch @@ -186,10 +186,10 @@ index 0000000000000000000000000000000000000000..ecde4462b08d701b8bff9f26902f1775 + RegionStats getRegionStats(); +} diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 2729f71ac5525b7669fb7cc8719a75e5ce8d1dfc..9020f0781b399484e2acf0ad139b0b364e1c7a8f 100644 +index 015d852d5a0c01042a2153a6916d408660356c59..c7b6f3f6c42746297816c0650571990f565d5e68 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -4409,4 +4409,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient +@@ -4432,4 +4432,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient } } } 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 dd513ce..ce6e5b5 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,7 +22,7 @@ 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 2d1b672fc152054d7b6abf47f443b87f5a2ea3de..3e4e0dcdd4e2808aef8dd41f159a358f47450f40 100644 +index c9afcd46f6a1b74b82ed68f1df6188369cf53a73..7cb95021f547c94eae7cef0bf5b2d8dff0a04937 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 { @@ -57,9 +57,9 @@ index 2d1b672fc152054d7b6abf47f443b87f5a2ea3de..3e4e0dcdd4e2808aef8dd41f159a358f // Paper start - persist for use in offline save data if (!nbttagcompound.contains("Paper")) { nbttagcompound.put("Paper", new CompoundTag()); -@@ -3611,4 +3629,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { - - return forwardMovement == backwardMovement ? 0 : forwardMovement ? 1 : -1; +@@ -3618,4 +3636,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { + public void setDeathScreenScore(final int score) { + getHandle().setScore(score); } + + // KioCG start - ChunkHot