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

Update to Minecraft 1.18-pre5

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-11-22 09:00:00 +11:00
parent a852b81a69
commit 43702a9e10
700 changed files with 10286 additions and 10098 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
paper-server/nms-patches/net/minecraft/stats/RecipeBookServer.patch
View File

@@ -11,18 +11,18 @@
public static final String RECIPE_BOOK_TAG = "recipeBook";
@@ -36,7 +38,7 @@
IRecipe<?> irecipe = (IRecipe) iterator.next();
MinecraftKey minecraftkey = irecipe.getKey();
MinecraftKey minecraftkey = irecipe.getId();
- if (!this.known.contains(minecraftkey) && !irecipe.isComplex()) {
+ if (!this.known.contains(minecraftkey) && !irecipe.isComplex() && CraftEventFactory.handlePlayerRecipeListUpdateEvent(entityplayer, minecraftkey)) { // CraftBukkit
this.a(minecraftkey);
this.d(minecraftkey);
- if (!this.known.contains(minecraftkey) && !irecipe.isSpecial()) {
+ if (!this.known.contains(minecraftkey) && !irecipe.isSpecial() && CraftEventFactory.handlePlayerRecipeListUpdateEvent(entityplayer, minecraftkey)) { // CraftBukkit
this.add(minecraftkey);
this.addHighlight(minecraftkey);
list.add(minecraftkey);
@@ -70,6 +72,7 @@
}
private void a(PacketPlayOutRecipes.Action packetplayoutrecipes_action, EntityPlayer entityplayer, List<MinecraftKey> list) {
private void sendRecipes(PacketPlayOutRecipes.Action packetplayoutrecipes_action, EntityPlayer entityplayer, List<MinecraftKey> list) {
+ if (entityplayer.connection == null) return; // SPIGOT-4478 during PlayerLoginEvent
entityplayer.connection.sendPacket(new PacketPlayOutRecipes(packetplayoutrecipes_action, list, Collections.emptyList(), this.a()));
entityplayer.connection.send(new PacketPlayOutRecipes(packetplayoutrecipes_action, list, Collections.emptyList(), this.getBookSettings()));
}

12
paper-server/nms-patches/net/minecraft/stats/ServerStatisticManager.patch
View File

@@ -8,19 +8,19 @@
@@ -161,13 +162,12 @@
}
private <T> Optional<Statistic<T>> a(StatisticWrapper<T> statisticwrapper, String s) {
- Optional optional = Optional.ofNullable(MinecraftKey.a(s));
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.a(s));
+ 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::b);
+ return optional.flatMap(iregistry::getOptional).map(statisticwrapper::b);
- return optional.map(statisticwrapper::get);
+ return optional.flatMap(iregistry::getOptional).map(statisticwrapper::get);
+ // CraftBukkit - decompile error end
}
private static NBTTagCompound a(JsonObject jsonobject) {
private static NBTTagCompound fromJson(JsonObject jsonobject) {

8
paper-server/nms-patches/net/minecraft/stats/StatisticManager.patch
View File

@@ -1,15 +1,15 @@
--- a/net/minecraft/stats/StatisticManager.java
+++ b/net/minecraft/stats/StatisticManager.java
@@ -16,6 +16,12 @@
public void b(EntityHuman entityhuman, Statistic<?> statistic, int i) {
int j = (int) Math.min((long) this.getStatisticValue(statistic) + (long) i, 2147483647L);
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.getStatisticValue(statistic), j);
+ 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.setStatistic(entityhuman, statistic, j);
this.setValue(entityhuman, statistic, j);
}