SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remap CraftBukkit to Mojang+Yarn Mappings

Browse Source 
By: Initial Source <noreply+automated@papermc.io>
This commit is contained in:
CraftBukkit/Spigot
2024-12-11 22:26:55 +01:00
parent a265d64138
commit 30e4583dbe
1780 changed files with 44628 additions and 41274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
paper-server/patches/sources/net/minecraft/stats/RecipeBookServer.patch → paper-server/patches/sources/net/minecraft/stats/ServerRecipeBook.java.patch
View File

@@ -1,20 +1,20 @@
--- a/net/minecraft/stats/RecipeBookServer.java
+++ b/net/minecraft/stats/RecipeBookServer.java
--- 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 RecipeBookServer extends RecipeBook {
public class ServerRecipeBook extends RecipeBook {
public static final String RECIPE_BOOK_TAG = "recipeBook";
@@ -72,7 +74,7 @@
RecipeHolder<?> recipeholder = (RecipeHolder) iterator.next();
ResourceKey<IRecipe<?>> resourcekey = recipeholder.id();
ResourceKey<Recipe<?>> resourcekey = recipeholder.id();
- if (!this.known.contains(resourcekey) && !recipeholder.value().isSpecial()) {
+ if (!this.known.contains(resourcekey) && !recipeholder.value().isSpecial() && CraftEventFactory.handlePlayerRecipeListUpdateEvent(entityplayer, resourcekey.location())) { // CraftBukkit
+ 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) -> {
@@ -23,8 +23,8 @@
}
- if (!list.isEmpty()) {
+ if (!list.isEmpty() && entityplayer.connection != null) { // SPIGOT-4478 during PlayerLoginEvent
entityplayer.connection.send(new ClientboundRecipeBookAddPacket(list, false));
+ if (!list.isEmpty() && player.connection != null) { // SPIGOT-4478 during PlayerLoginEvent
player.connection.send(new ClientboundRecipeBookAddPacket(list, false));
}
@@ -105,7 +107,7 @@
@@ -32,7 +32,7 @@
}
- if (!list.isEmpty()) {
+ if (!list.isEmpty() && entityplayer.connection != null) { // SPIGOT-4478 during PlayerLoginEvent
entityplayer.connection.send(new ClientboundRecipeBookRemovePacket(list));
+ if (!list.isEmpty() && player.connection != null) { // SPIGOT-4478 during PlayerLoginEvent
player.connection.send(new ClientboundRecipeBookRemovePacket(list));
}

26
paper-server/patches/sources/net/minecraft/stats/ServerStatisticManager.patch
View File

@@ -1,26 +0,0 @@
--- a/net/minecraft/stats/ServerStatisticManager.java
+++ b/net/minecraft/stats/ServerStatisticManager.java
@@ -1,3 +1,4 @@
+// mc-dev import
package net.minecraft.stats;
import com.google.common.collect.Maps;
@@ -158,13 +159,12 @@
}
private <T> Optional<Statistic<T>> getStat(StatisticWrapper<T> statisticwrapper, String s) {
- Optional optional = Optional.ofNullable(MinecraftKey.tryParse(s));
- IRegistry iregistry = statisticwrapper.getRegistry();
+ // CraftBukkit - decompile error start
+ Optional<MinecraftKey> optional = Optional.ofNullable(MinecraftKey.tryParse(s));
+ IRegistry<T> iregistry = statisticwrapper.getRegistry();
- Objects.requireNonNull(iregistry);
- optional = optional.flatMap(iregistry::getOptional);
- Objects.requireNonNull(statisticwrapper);
- return optional.map(statisticwrapper::get);
+ return optional.flatMap(iregistry::getOptional).map(statisticwrapper::get);
+ // CraftBukkit - decompile error end
}
private static NBTTagCompound fromJson(JsonObject jsonobject) {

26
paper-server/patches/sources/net/minecraft/stats/ServerStatsCounter.java.patch Normal file
View File

@@ -0,0 +1,26 @@
--- 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;
@@ -158,13 +159,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) {

15
paper-server/patches/sources/net/minecraft/stats/StatisticManager.patch
View File

@@ -1,15 +0,0 @@
--- a/net/minecraft/stats/StatisticManager.java
+++ b/net/minecraft/stats/StatisticManager.java
@@ -16,6 +16,12 @@
public void increment(EntityHuman entityhuman, Statistic<?> statistic, int i) {
int j = (int) Math.min((long) this.getValue(statistic) + (long) i, 2147483647L);
+ // CraftBukkit start - fire Statistic events
+ org.bukkit.event.Cancellable cancellable = org.bukkit.craftbukkit.event.CraftEventFactory.handleStatisticsIncrease(entityhuman, statistic, this.getValue(statistic), j);
+ if (cancellable != null && cancellable.isCancelled()) {
+ return;
+ }
+ // CraftBukkit end
this.setValue(entityhuman, statistic, j);
}

15
paper-server/patches/sources/net/minecraft/stats/StatsCounter.java.patch Normal file
View File

@@ -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);
}