Move patches to unapplied

2024-12-12 12:22:12 +01:00
parent ff75689b08
commit 45ddf764d9
821 changed files with 0 additions and 0 deletions
--- a/paper-server/patches/unapplied/net/minecraft/stats/ServerRecipeBook.java.patch
+++ b/paper-server/patches/unapplied/net/minecraft/stats/ServerRecipeBook.java.patch
@@ -0,0 +1,38 @@
+--- a/net/minecraft/stats/ServerRecipeBook.java
+++ b/net/minecraft/stats/ServerRecipeBook.java
+@@ -29,6 +29,8 @@
+ import net.minecraft.world.item.crafting.display.RecipeDisplayId;
+ import org.slf4j.Logger;
+ 
+import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
+
+ public class ServerRecipeBook extends RecipeBook {
+ 
+     public static final String RECIPE_BOOK_TAG = "recipeBook";
+@@ -72,7 +74,7 @@
+             RecipeHolder<?> recipeholder = (RecipeHolder) iterator.next();
+             ResourceKey<Recipe<?>> resourcekey = recipeholder.id();
+ 
+-            if (!this.known.contains(resourcekey) && !recipeholder.value().isSpecial()) {
+            if (!this.known.contains(resourcekey) && !recipeholder.value().isSpecial() && CraftEventFactory.handlePlayerRecipeListUpdateEvent(player, resourcekey.location())) { // CraftBukkit
+                 this.add(resourcekey);
+                 this.addHighlight(resourcekey);
+                 this.displayResolver.displaysForRecipe(resourcekey, (recipedisplayentry) -> {
+@@ -82,7 +84,7 @@
+             }
+         }
+ 
+-        if (!list.isEmpty()) {
+        if (!list.isEmpty() && player.connection != null) { // SPIGOT-4478 during PlayerLoginEvent
+             player.connection.send(new ClientboundRecipeBookAddPacket(list, false));
+         }
+ 
+@@ -105,7 +107,7 @@
+             }
+         }
+ 
+-        if (!list.isEmpty()) {
+        if (!list.isEmpty() && player.connection != null) { // SPIGOT-4478 during PlayerLoginEvent
+             player.connection.send(new ClientboundRecipeBookRemovePacket(list));
+         }
+ 
--- a/paper-server/patches/unapplied/net/minecraft/stats/ServerStatsCounter.java.patch
+++ b/paper-server/patches/unapplied/net/minecraft/stats/ServerStatsCounter.java.patch
@@ -0,0 +1,58 @@
+--- a/net/minecraft/stats/ServerStatsCounter.java
+++ b/net/minecraft/stats/ServerStatsCounter.java
+@@ -1,3 +1,4 @@
+// mc-dev import
+ package net.minecraft.stats;
+ 
+ import com.google.common.collect.Maps;
+@@ -57,9 +58,22 @@
+             }
+         }
+ 
+        // Paper start - Moved after stat fetching for player state file
+        // Moves the loading after vanilla loading, so it overrides the values.
+        // Disables saving any forced stats, so it stays at the same value (without enabling disableStatSaving)
+        // Fixes stat initialization to not cause a NullPointerException
+        // Spigot start
+        for ( Map.Entry<ResourceLocation, Integer> entry : org.spigotmc.SpigotConfig.forcedStats.entrySet() )
+        {
+            Stat<ResourceLocation> wrapper = Stats.CUSTOM.get(java.util.Objects.requireNonNull(BuiltInRegistries.CUSTOM_STAT.getValue(entry.getKey()))); // Paper - ensured by SpigotConfig#stats
+            this.stats.put( wrapper, entry.getValue().intValue() );
+        }
+        // Spigot end
+        // Paper end - Moved after stat fetching for player state file
+     }
+ 
+     public void save() {
+        if ( org.spigotmc.SpigotConfig.disableStatSaving ) return; // Spigot
+         try {
+             FileUtils.writeStringToFile(this.file, this.toJson());
+         } catch (IOException ioexception) {
+@@ -70,6 +84,8 @@
+ 
+     @Override
+     public void setValue(Player player, Stat<?> stat, int value) {
+        if ( org.spigotmc.SpigotConfig.disableStatSaving ) return; // Spigot
+        if (stat.getType() == Stats.CUSTOM && stat.getValue() instanceof final ResourceLocation resourceLocation && org.spigotmc.SpigotConfig.forcedStats.get(resourceLocation) != null) return; // Paper - disable saving forced stats
+         super.setValue(player, stat, value);
+         this.dirty.add(stat);
+     }
+@@ -158,13 +174,12 @@
+     }
+ 
+     private <T> Optional<Stat<T>> getStat(StatType<T> type, String id) {
+-        Optional optional = Optional.ofNullable(ResourceLocation.tryParse(id));
+-        Registry iregistry = type.getRegistry();
+        // CraftBukkit - decompile error start
+        Optional<ResourceLocation> optional = Optional.ofNullable(ResourceLocation.tryParse(id));
+        Registry<T> iregistry = type.getRegistry();
+ 
+-        Objects.requireNonNull(iregistry);
+-        optional = optional.flatMap(iregistry::getOptional);
+-        Objects.requireNonNull(type);
+-        return optional.map(type::get);
+        return optional.flatMap(iregistry::getOptional).map(type::get);
+        // CraftBukkit - decompile error end
+     }
+ 
+     private static CompoundTag fromJson(JsonObject json) {
--- a/paper-server/patches/unapplied/net/minecraft/stats/StatsCounter.java.patch
+++ b/paper-server/patches/unapplied/net/minecraft/stats/StatsCounter.java.patch
@@ -0,0 +1,15 @@
+--- a/net/minecraft/stats/StatsCounter.java
+++ b/net/minecraft/stats/StatsCounter.java
+@@ -16,6 +16,12 @@
+     public void increment(Player player, Stat<?> stat, int value) {
+         int j = (int) Math.min((long) this.getValue(stat) + (long) value, 2147483647L);
+ 
+        // CraftBukkit start - fire Statistic events
+        org.bukkit.event.Cancellable cancellable = org.bukkit.craftbukkit.event.CraftEventFactory.handleStatisticsIncrease(player, stat, this.getValue(stat), j);
+        if (cancellable != null && cancellable.isCancelled()) {
+            return;
+        }
+        // CraftBukkit end
+         this.setValue(player, stat, j);
+     }
+