From b3b4a11b6c9dd5f245259649b8ccdac353e9aaa9 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 16 Nov 2020 12:51:17 -0600 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appears to apply and compile correctly Paper Changes: a162213b Location#getHighestLocation should support Upstream API (#4770) c093c431 Add exception handlers for getChunkAtAsync convenience methods (#4773) f842ed1f Add exception handlers for getChunkAtAsync convenience methods 858a6e33 [CI-SKIP] Add `curl` requirement for building paper. (#4768) --- Paper | 2 +- current-paper | 2 +- ...ustable-breeding-cooldown-to-config.patch} | 2 +- ...-animal-breeding-times-configurable.patch} | 34 +++++++++---------- 4 files changed, 20 insertions(+), 20 deletions(-) rename patches/server/{0139-Add-adjustable-breeding-cooldown-to-config.patch => 0140-Add-adjustable-breeding-cooldown-to-config.patch} (99%) rename patches/server/{0140-Make-animal-breeding-times-configurable.patch => 0141-Make-animal-breeding-times-configurable.patch} (96%) diff --git a/Paper b/Paper index 2f0e0a6da..a162213b2 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 2f0e0a6da08b1f1b6e9512195b9f849d9078f4fe +Subproject commit a162213b245ddab0c139537e59ee9986d9bbb5c9 diff --git a/current-paper b/current-paper index 25627320a..34ba60362 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.16.4--5a228dbd8274d5fd6c98d1ab645ecd7772c0845b +1.16.4-- diff --git a/patches/server/0139-Add-adjustable-breeding-cooldown-to-config.patch b/patches/server/0140-Add-adjustable-breeding-cooldown-to-config.patch similarity index 99% rename from patches/server/0139-Add-adjustable-breeding-cooldown-to-config.patch rename to patches/server/0140-Add-adjustable-breeding-cooldown-to-config.patch index 79e475915..6c77024f5 100644 --- a/patches/server/0139-Add-adjustable-breeding-cooldown-to-config.patch +++ b/patches/server/0140-Add-adjustable-breeding-cooldown-to-config.patch @@ -94,7 +94,7 @@ index 281bba56e..5adc630bb 100644 this.generator = gen; this.world = new CraftWorld((WorldServer) this, gen, env); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index e080aa482..9eeedb6e7 100644 +index 1ef3a2c5e..43fb54b3e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -204,6 +204,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0140-Make-animal-breeding-times-configurable.patch b/patches/server/0141-Make-animal-breeding-times-configurable.patch similarity index 96% rename from patches/server/0140-Make-animal-breeding-times-configurable.patch rename to patches/server/0141-Make-animal-breeding-times-configurable.patch index c042052ab..dc6cc38a1 100644 --- a/patches/server/0140-Make-animal-breeding-times-configurable.patch +++ b/patches/server/0141-Make-animal-breeding-times-configurable.patch @@ -398,10 +398,10 @@ index 9ae716859..6c25f667e 100644 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 9eeedb6e7..25654a81a 100644 +index 43fb54b3e..f72197d70 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -425,10 +425,12 @@ public class PurpurWorldConfig { +@@ -427,10 +427,12 @@ public class PurpurWorldConfig { public boolean beeRidable = false; public boolean beeRidableInWater = false; public double beeMaxY = 256D; @@ -414,7 +414,7 @@ index 9eeedb6e7..25654a81a 100644 } public boolean blazeRidable = false; -@@ -445,12 +447,14 @@ public class PurpurWorldConfig { +@@ -447,12 +449,14 @@ public class PurpurWorldConfig { public int catSpawnDelay = 1200; public int catSpawnSwampHutScanRange = 16; public int catSpawnVillageScanRange = 48; @@ -429,7 +429,7 @@ index 9eeedb6e7..25654a81a 100644 } public boolean caveSpiderRidable = false; -@@ -463,10 +467,12 @@ public class PurpurWorldConfig { +@@ -465,10 +469,12 @@ public class PurpurWorldConfig { public boolean chickenRidable = false; public boolean chickenRidableInWater = false; public boolean chickenRetaliate = false; @@ -442,7 +442,7 @@ index 9eeedb6e7..25654a81a 100644 } public boolean codRidable = false; -@@ -477,10 +483,12 @@ public class PurpurWorldConfig { +@@ -479,10 +485,12 @@ public class PurpurWorldConfig { public boolean cowRidable = false; public boolean cowRidableInWater = false; public int cowFeedMushrooms = 0; @@ -455,7 +455,7 @@ index 9eeedb6e7..25654a81a 100644 } public boolean creeperRidable = false; -@@ -508,8 +516,10 @@ public class PurpurWorldConfig { +@@ -510,8 +518,10 @@ public class PurpurWorldConfig { } public boolean donkeyRidableInWater = false; @@ -466,7 +466,7 @@ index 9eeedb6e7..25654a81a 100644 } public boolean drownedRidable = false; -@@ -571,10 +581,12 @@ public class PurpurWorldConfig { +@@ -573,10 +583,12 @@ public class PurpurWorldConfig { public boolean foxRidable = false; public boolean foxRidableInWater = false; public boolean foxTypeChangesWithTulips = false; @@ -479,7 +479,7 @@ index 9eeedb6e7..25654a81a 100644 } public boolean ghastRidable = false; -@@ -614,14 +626,18 @@ public class PurpurWorldConfig { +@@ -616,14 +628,18 @@ public class PurpurWorldConfig { public boolean hoglinRidable = false; public boolean hoglinRidableInWater = false; @@ -498,7 +498,7 @@ index 9eeedb6e7..25654a81a 100644 } public boolean huskRidable = false; -@@ -661,9 +677,11 @@ public class PurpurWorldConfig { +@@ -663,9 +679,11 @@ public class PurpurWorldConfig { public boolean llamaRidable = false; public boolean llamaRidableInWater = false; @@ -510,7 +510,7 @@ index 9eeedb6e7..25654a81a 100644 } public boolean llamaTraderRidable = false; -@@ -682,28 +700,36 @@ public class PurpurWorldConfig { +@@ -684,28 +702,36 @@ public class PurpurWorldConfig { public boolean mooshroomRidable = false; public boolean mooshroomRidableInWater = false; @@ -547,7 +547,7 @@ index 9eeedb6e7..25654a81a 100644 } public boolean parrotRidable = false; -@@ -767,10 +793,12 @@ public class PurpurWorldConfig { +@@ -769,10 +795,12 @@ public class PurpurWorldConfig { public boolean pigRidable = false; public boolean pigRidableInWater = false; public boolean pigGiveSaddleBack = false; @@ -560,7 +560,7 @@ index 9eeedb6e7..25654a81a 100644 } public boolean piglinRidable = false; -@@ -798,12 +826,14 @@ public class PurpurWorldConfig { +@@ -800,12 +828,14 @@ public class PurpurWorldConfig { public boolean polarBearRidableInWater = false; public String polarBearBreedableItemString = ""; public Item polarBearBreedableItem = null; @@ -575,7 +575,7 @@ index 9eeedb6e7..25654a81a 100644 } public boolean pufferfishRidable = false; -@@ -815,11 +845,13 @@ public class PurpurWorldConfig { +@@ -817,11 +847,13 @@ public class PurpurWorldConfig { public boolean rabbitRidableInWater = false; public double rabbitNaturalToast = 0.0D; public double rabbitNaturalKiller = 0.0D; @@ -589,7 +589,7 @@ index 9eeedb6e7..25654a81a 100644 } public boolean ravagerRidable = false; -@@ -836,9 +868,11 @@ public class PurpurWorldConfig { +@@ -838,9 +870,11 @@ public class PurpurWorldConfig { public boolean sheepRidable = false; public boolean sheepRidableInWater = false; @@ -601,7 +601,7 @@ index 9eeedb6e7..25654a81a 100644 } public boolean shulkerRidable = false; -@@ -916,9 +950,11 @@ public class PurpurWorldConfig { +@@ -918,9 +952,11 @@ public class PurpurWorldConfig { public boolean striderRidable = false; public boolean striderRidableInWater = false; @@ -613,7 +613,7 @@ index 9eeedb6e7..25654a81a 100644 } public boolean tropicalFishRidable = false; -@@ -928,9 +964,11 @@ public class PurpurWorldConfig { +@@ -930,9 +966,11 @@ public class PurpurWorldConfig { public boolean turtleRidable = false; public boolean turtleRidableInWater = false; @@ -625,7 +625,7 @@ index 9eeedb6e7..25654a81a 100644 } public boolean vexRidable = false; -@@ -1018,9 +1056,11 @@ public class PurpurWorldConfig { +@@ -1020,9 +1058,11 @@ public class PurpurWorldConfig { public boolean wolfRidable = false; public boolean wolfRidableInWater = false;