mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated Upstream (CraftBukkit/Spigot)

Browse source 
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
183139d4 SPIGOT-5665: Improve loading spawn egg NBT
dec5df26 SPIGOT-5667: Can't add recipe without (vanilla) datapack

Spigot Changes:
ae72bf43 SPIGOT-5666: Customizable End City Seed
This commit is contained in:
Aikar 2020-04-09 21:33:10 -04:00
parent ebbca5cedb
commit bc8fafb206
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Spigot-Server-Patches/0003-MC-Dev-fixes.patch
View file

@ -1,4 +1,4 @@
From 29db27ff694ef581b57ddb68fb6ff50f9a171818 Mon Sep 17 00:00:00 2001 From b842654dba6b06d20f645ab009557566a67eca88 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 30 Mar 2016 19:36:20 -0400 Date: Wed, 30 Mar 2016 19:36:20 -0400
Subject: [PATCH] MC Dev fixes Subject: [PATCH] MC Dev fixes
@ -167,10 +167,10 @@ index 68a601bac5..efdf611e66 100644
for (int j = a().size() - 1; j >= 0; --j) { for (int j = a().size() - 1; j >= 0; --j) {
diff --git a/src/main/java/net/minecraft/server/CraftingManager.java b/src/main/java/net/minecraft/server/CraftingManager.java diff --git a/src/main/java/net/minecraft/server/CraftingManager.java b/src/main/java/net/minecraft/server/CraftingManager.java
index 2dd27edc83..6def3616ef 100644 index ca9ed57391..f0d7a91fa0 100644
--- a/src/main/java/net/minecraft/server/CraftingManager.java --- a/src/main/java/net/minecraft/server/CraftingManager.java
+++ b/src/main/java/net/minecraft/server/CraftingManager.java +++ b/src/main/java/net/minecraft/server/CraftingManager.java
@@ -58,7 +58,7 @@ public class CraftingManager extends ResourceDataJson { @@ -63,7 +63,7 @@ public class CraftingManager extends ResourceDataJson {
} }
this.recipes = (Map) map1.entrySet().stream().collect(ImmutableMap.toImmutableMap(Entry::getKey, (entry1) -> { this.recipes = (Map) map1.entrySet().stream().collect(ImmutableMap.toImmutableMap(Entry::getKey, (entry1) -> {

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit f7d6ad53eeb1ad3a4372cc73fe77eac4e01a9470 Subproject commit 183139d41f9c59f4b51ffa79eec4c04762fd9ae8

2
work/Spigot

@ -1 +1 @@
Subproject commit a03b1fdbaff792c6a1de74bd553fcb0d24f44849 Subproject commit ae72bf43fdca116a37e278fc2c8066d3a04ec7e6