From a1fa22115251ecb058513721920bc777c03c69eb Mon Sep 17 00:00:00 2001 From: jmp Date: Thu, 10 Dec 2020 14:24:14 -0800 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: 31ac45a0a Fix curing villager makes equipment disappear --- Paper | 2 +- current-paper | 2 +- ...ix-drops-when-curing-zombie-villager.patch | 38 ------------------- ... => 0156-Lobotomize-stuck-villagers.patch} | 2 +- ...illager-Clerics-to-farm-Nether-Wart.patch} | 2 +- ...ied-Piglin-death-always-counting-as.patch} | 2 +- ...-out-and-optimise-player-list-ticks.patch} | 2 +- ...le-chance-for-Wolves-to-spawn-rabid.patch} | 4 +- ...figurable-default-wolf-collar-color.patch} | 4 +- 9 files changed, 10 insertions(+), 48 deletions(-) delete mode 100644 patches/server/0156-Fix-drops-when-curing-zombie-villager.patch rename patches/server/{0157-Lobotomize-stuck-villagers.patch => 0156-Lobotomize-stuck-villagers.patch} (99%) rename patches/server/{0158-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch => 0157-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch} (99%) rename patches/server/{0159-Toggle-for-Zombified-Piglin-death-always-counting-as.patch => 0158-Toggle-for-Zombified-Piglin-death-always-counting-as.patch} (98%) rename patches/server/{0160-Spread-out-and-optimise-player-list-ticks.patch => 0159-Spread-out-and-optimise-player-list-ticks.patch} (98%) rename patches/server/{0161-Configurable-chance-for-Wolves-to-spawn-rabid.patch => 0160-Configurable-chance-for-Wolves-to-spawn-rabid.patch} (99%) rename patches/server/{0162-Configurable-default-wolf-collar-color.patch => 0161-Configurable-default-wolf-collar-color.patch} (97%) diff --git a/Paper b/Paper index cc0494817..31ac45a0a 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit cc0494817694a705bfd6a06218ccdf3881fa8566 +Subproject commit 31ac45a0a272c4c759fd4927172e5e81dd4a34ba diff --git a/current-paper b/current-paper index aafdc0085..c63ae7315 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.16.4--3a5de1207a384d66b0a3cf46c5baa0633839cc53 +1.16.4--3489b4ed8e37a9805e25679a998065df8b249622 diff --git a/patches/server/0156-Fix-drops-when-curing-zombie-villager.patch b/patches/server/0156-Fix-drops-when-curing-zombie-villager.patch deleted file mode 100644 index fed7b0dd8..000000000 --- a/patches/server/0156-Fix-drops-when-curing-zombie-villager.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: BillyGalbreath -Date: Thu, 3 Dec 2020 15:13:59 -0600 -Subject: [PATCH] Fix drops when curing zombie villager - - -diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java -index 7db942c659..d5d07b8042 100644 ---- a/src/main/java/net/minecraft/server/EntityZombieVillager.java -+++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java -@@ -207,7 +207,9 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo - double d0 = (double) this.e(enumitemslot); - - if (d0 > 1.0D) { -+ this.forceDrops = world.purpurConfig.zombieVillagerFixCureDrops; // Purpur - this.a(itemstack); -+ this.forceDrops = false; // Purpur - } - } - } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6b80bc373f..514788c208 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1184,11 +1184,13 @@ public class PurpurWorldConfig { - public boolean zombieVillagerJockeyOnlyBaby = true; - public double zombieVillagerJockeyChance = 0.05D; - public boolean zombieVillagerJockeyTryExistingChickens = true; -+ public boolean zombieVillagerFixCureDrops = false; - private void zombieVillagerSettings() { - zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable); - zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater); - zombieVillagerJockeyOnlyBaby = getBoolean("mobs.zombie_villager.jockey.only-babies", zombieVillagerJockeyOnlyBaby); - zombieVillagerJockeyChance = getDouble("mobs.zombie_villager.jockey.chance", zombieVillagerJockeyChance); - zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens); -+ zombieVillagerFixCureDrops = getBoolean("mobs.zombie_villager.fix-drops-on-cure", zombieVillagerFixCureDrops); - } - } diff --git a/patches/server/0157-Lobotomize-stuck-villagers.patch b/patches/server/0156-Lobotomize-stuck-villagers.patch similarity index 99% rename from patches/server/0157-Lobotomize-stuck-villagers.patch rename to patches/server/0156-Lobotomize-stuck-villagers.patch index c725431a4..8ffd22b35 100644 --- a/patches/server/0157-Lobotomize-stuck-villagers.patch +++ b/patches/server/0156-Lobotomize-stuck-villagers.patch @@ -71,7 +71,7 @@ index b92ca4a6de..1208464fba 100644 // Paper start - add target parameter return this.a(blockposition, null, i); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 514788c208..659b540aa1 100644 +index 6b80bc373f..092edac7d3 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1056,6 +1056,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0158-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/patches/server/0157-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch similarity index 99% rename from patches/server/0158-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch rename to patches/server/0157-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch index bd55c0d3f..80599616f 100644 --- a/patches/server/0158-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch +++ b/patches/server/0157-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch @@ -234,7 +234,7 @@ index 3c60da7ac6..6493f220a0 100644 public static final VillagerProfession FISHERMAN = a("fisherman", VillagePlaceType.i, SoundEffects.ENTITY_VILLAGER_WORK_FISHERMAN); public static final VillagerProfession FLETCHER = a("fletcher", VillagePlaceType.j, SoundEffects.ENTITY_VILLAGER_WORK_FLETCHER); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 659b540aa1..7ade1c54ad 100644 +index 092edac7d3..130c973f60 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1057,6 +1057,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0159-Toggle-for-Zombified-Piglin-death-always-counting-as.patch b/patches/server/0158-Toggle-for-Zombified-Piglin-death-always-counting-as.patch similarity index 98% rename from patches/server/0159-Toggle-for-Zombified-Piglin-death-always-counting-as.patch rename to patches/server/0158-Toggle-for-Zombified-Piglin-death-always-counting-as.patch index f4fdd9baa..8c49473e6 100644 --- a/patches/server/0159-Toggle-for-Zombified-Piglin-death-always-counting-as.patch +++ b/patches/server/0158-Toggle-for-Zombified-Piglin-death-always-counting-as.patch @@ -35,7 +35,7 @@ index 3327dbbf87..57f3358b8d 100644 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 7ade1c54ad..cc92689b4c 100644 +index 130c973f60..4264d9d1ec 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1177,12 +1177,14 @@ public class PurpurWorldConfig { diff --git a/patches/server/0160-Spread-out-and-optimise-player-list-ticks.patch b/patches/server/0159-Spread-out-and-optimise-player-list-ticks.patch similarity index 98% rename from patches/server/0160-Spread-out-and-optimise-player-list-ticks.patch rename to patches/server/0159-Spread-out-and-optimise-player-list-ticks.patch index a3383c4e0..b35c508c0 100644 --- a/patches/server/0160-Spread-out-and-optimise-player-list-ticks.patch +++ b/patches/server/0159-Spread-out-and-optimise-player-list-ticks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Spread out and optimise player list ticks diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 3f634a266f..8229e9642e 100644 +index eae19141e3..881db63d6f 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -71,7 +71,7 @@ public abstract class PlayerList { diff --git a/patches/server/0161-Configurable-chance-for-Wolves-to-spawn-rabid.patch b/patches/server/0160-Configurable-chance-for-Wolves-to-spawn-rabid.patch similarity index 99% rename from patches/server/0161-Configurable-chance-for-Wolves-to-spawn-rabid.patch rename to patches/server/0160-Configurable-chance-for-Wolves-to-spawn-rabid.patch index 88370373b..dc9be48d8 100644 --- a/patches/server/0161-Configurable-chance-for-Wolves-to-spawn-rabid.patch +++ b/patches/server/0160-Configurable-chance-for-Wolves-to-spawn-rabid.patch @@ -19,7 +19,7 @@ index ce29695c69..a5a7b426eb 100644 if (enumhand == EnumHand.MAIN_HAND) { this.setSlot(EnumItemSlot.MAINHAND, itemstack); diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java -index 6c25f667ee..668c877ece 100644 +index 6c25f667ee..fa7f47fef9 100644 --- a/src/main/java/net/minecraft/server/EntityWolf.java +++ b/src/main/java/net/minecraft/server/EntityWolf.java @@ -14,11 +14,42 @@ public class EntityWolf extends EntityTameableAnimal implements IEntityAngerable @@ -197,7 +197,7 @@ index 9a4819815c..da29898574 100644 public PathfinderGoalAvoidTarget(EntityCreature entitycreature, Class oclass, Predicate predicate, float f, double d0, double d1, Predicate predicate1) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index cc92689b4c..e76ae515d9 100644 +index 4264d9d1ec..a39efcdbdc 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1128,10 +1128,14 @@ public class PurpurWorldConfig { diff --git a/patches/server/0162-Configurable-default-wolf-collar-color.patch b/patches/server/0161-Configurable-default-wolf-collar-color.patch similarity index 97% rename from patches/server/0162-Configurable-default-wolf-collar-color.patch rename to patches/server/0161-Configurable-default-wolf-collar-color.patch index 15b739ecd..3cfe7c274 100644 --- a/patches/server/0162-Configurable-default-wolf-collar-color.patch +++ b/patches/server/0161-Configurable-default-wolf-collar-color.patch @@ -7,7 +7,7 @@ This allows for the server to set a default collar color when a wolf is tamed. Resets to RED when the value is invalid. diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java -index fa7f47fef..ca38c2224 100644 +index fa7f47fef9..ca38c22241 100644 --- a/src/main/java/net/minecraft/server/EntityWolf.java +++ b/src/main/java/net/minecraft/server/EntityWolf.java @@ -114,6 +114,12 @@ public class EntityWolf extends EntityTameableAnimal implements IEntityAngerable @@ -24,7 +24,7 @@ index fa7f47fef..ca38c2224 100644 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index e76ae515d..bebceda3c 100644 +index a39efcdbdc..83849136ed 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -3,6 +3,7 @@ package net.pl3x.purpur;