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

Update to Minecraft 1.17

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-06-11 15:00:00 +10:00
parent 75faba7fde
commit b3a8254758
619 changed files with 10708 additions and 8451 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

@@ -8,21 +8,21 @@
+
public class RecipeBookServer extends RecipeBook {
private static final Logger LOGGER = LogManager.getLogger();
@@ -35,7 +37,7 @@
public static final String RECIPE_BOOK_TAG = "recipeBook";
@@ -36,7 +38,7 @@
IRecipe<?> irecipe = (IRecipe) iterator.next();
MinecraftKey minecraftkey = irecipe.getKey();
- if (!this.recipes.contains(minecraftkey) && !irecipe.isComplex()) {
+ if (!this.recipes.contains(minecraftkey) && !irecipe.isComplex() && CraftEventFactory.handlePlayerRecipeListUpdateEvent(entityplayer, minecraftkey)) { // CraftBukkit
- 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);
list.add(minecraftkey);
@@ -69,6 +71,7 @@
@@ -70,6 +72,7 @@
}
private void a(PacketPlayOutRecipes.Action packetplayoutrecipes_action, EntityPlayer entityplayer, List<MinecraftKey> list) {
+ if (entityplayer.playerConnection == null) return; // SPIGOT-4478 during PlayerLoginEvent
entityplayer.playerConnection.sendPacket(new PacketPlayOutRecipes(packetplayoutrecipes_action, list, Collections.emptyList(), this.a()));
+ if (entityplayer.connection == null) return; // SPIGOT-4478 during PlayerLoginEvent
entityplayer.connection.sendPacket(new PacketPlayOutRecipes(packetplayoutrecipes_action, list, Collections.emptyList(), this.a()));
}

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

@@ -5,7 +5,7 @@
package net.minecraft.stats;
import com.google.common.collect.Maps;
@@ -158,13 +159,12 @@
@@ -161,13 +162,12 @@
}
private <T> Optional<Statistic<T>> a(StatisticWrapper<T> statisticwrapper, String s) {
@@ -15,9 +15,9 @@
+ Optional<MinecraftKey> optional = Optional.ofNullable(MinecraftKey.a(s));
+ IRegistry<T> iregistry = statisticwrapper.getRegistry();
- iregistry.getClass();
- Objects.requireNonNull(iregistry);
- optional = optional.flatMap(iregistry::getOptional);
- statisticwrapper.getClass();
- Objects.requireNonNull(statisticwrapper);
- return optional.map(statisticwrapper::b);
+ return optional.flatMap(iregistry::getOptional).map(statisticwrapper::b);
+ // CraftBukkit - decompile error end