From be941d8428321bc535121848f95d0236a1953271 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 8 Feb 2021 13:17:28 -0600 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: 3dadd97bb [CI-SKIP] [Meta] Exempt more labels from being marked as stale (#5142) 36a72cad3 [Auto] Updated Upstream (Bukkit/CraftBukkit/Spigot) 13a476e15 Deprecate PlayerLeaveBedEvent#setBedSpawn 3a1d95c71 [Auto] Updated Upstream (CraftBukkit) --- Paper | 2 +- patches/api/0019-ItemStack-convenience-methods.patch | 4 ++-- patches/server/0001-Tuinity-Server-Changes.patch | 2 +- patches/server/0105-Ridables.patch | 2 +- .../server/0128-Make-animal-breeding-times-configurable.patch | 2 +- patches/server/0153-Configurable-entity-base-attributes.patch | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Paper b/Paper index d4dcc1a2e..3dadd97bb 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit d4dcc1a2e65c14a9c84f6a723ec4f75597b88f51 +Subproject commit 3dadd97bbc9f622c62c5a6d885fe9453a003cbe6 diff --git a/patches/api/0019-ItemStack-convenience-methods.patch b/patches/api/0019-ItemStack-convenience-methods.patch index 1d5242c5c..27851fc55 100644 --- a/patches/api/0019-ItemStack-convenience-methods.patch +++ b/patches/api/0019-ItemStack-convenience-methods.patch @@ -5,10 +5,10 @@ Subject: [PATCH] ItemStack convenience methods diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 4ba991b79f13219182df35b4ce0c5cf57cbd208b..a2e476f154344f9473dd9b48866505448de56d84 100644 +index 2a3becabbd10fa8ffd19f35a3f6d8a6bfcb388c3..f71c9fd069309ef330d9065760b80ec10de7e18b 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -8645,4 +8645,36 @@ public enum Material implements Keyed { +@@ -8642,4 +8642,36 @@ public enum Material implements Keyed { // } } diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch index ed5b148ba..eb787f92c 100644 --- a/patches/server/0001-Tuinity-Server-Changes.patch +++ b/patches/server/0001-Tuinity-Server-Changes.patch @@ -10345,7 +10345,7 @@ index 1e7f5957d879d1ba8cf2b29cf9397b8e204e4381..f983516b89cdf7ce7fdea8f5a5b1a29d if (movingobjectpositionentity == null || this.getPierceLevel() <= 0) { diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java -index e80ec303198abade19645267e24cd5a4a8b75d70..35f511c398795a0edeb5fe6d802f2a2bf754bf3a 100644 +index 8bc8dcf7dfe79c5522bc715ad60aeaab4b1d85da..675083e3952779e43bf8cc3175ad70458a79e49c 100644 --- a/src/main/java/net/minecraft/server/EntityCat.java +++ b/src/main/java/net/minecraft/server/EntityCat.java @@ -292,7 +292,7 @@ public class EntityCat extends EntityTameableAnimal { diff --git a/patches/server/0105-Ridables.patch b/patches/server/0105-Ridables.patch index 1a0e80ddf..a10034923 100644 --- a/patches/server/0105-Ridables.patch +++ b/patches/server/0105-Ridables.patch @@ -614,7 +614,7 @@ index 74082136b38491a0a50d152c455edfa61a6afb9f..dcfad16e06450068d5801fc002c96501 if (this.c <= 0) { this.c = 100; diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java -index 35f511c398795a0edeb5fe6d802f2a2bf754bf3a..700314b02abb355e6a600d744887a705cbcfb4e4 100644 +index 675083e3952779e43bf8cc3175ad70458a79e49c..0e6552d77adb95c94cb06b6f9289c4c12e6955bb 100644 --- a/src/main/java/net/minecraft/server/EntityCat.java +++ b/src/main/java/net/minecraft/server/EntityCat.java @@ -41,6 +41,25 @@ public class EntityCat extends EntityTameableAnimal { diff --git a/patches/server/0128-Make-animal-breeding-times-configurable.patch b/patches/server/0128-Make-animal-breeding-times-configurable.patch index 2ec510f13..202c45773 100644 --- a/patches/server/0128-Make-animal-breeding-times-configurable.patch +++ b/patches/server/0128-Make-animal-breeding-times-configurable.patch @@ -46,7 +46,7 @@ index d8354ec4d19fc3fbddc2551ee217acb137482e63..ded4e10f5082fb5aa25368d9035affba @Override diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java -index 700314b02abb355e6a600d744887a705cbcfb4e4..8346db6c8521064ff51445a0da747a2d70d14633 100644 +index 0e6552d77adb95c94cb06b6f9289c4c12e6955bb..437a7b8ffb40c461f1778d91591fa6c4dcf36834 100644 --- a/src/main/java/net/minecraft/server/EntityCat.java +++ b/src/main/java/net/minecraft/server/EntityCat.java @@ -58,6 +58,11 @@ public class EntityCat extends EntityTameableAnimal { diff --git a/patches/server/0153-Configurable-entity-base-attributes.patch b/patches/server/0153-Configurable-entity-base-attributes.patch index 95a90fbde..6a167d537 100644 --- a/patches/server/0153-Configurable-entity-base-attributes.patch +++ b/patches/server/0153-Configurable-entity-base-attributes.patch @@ -60,7 +60,7 @@ index dcfad16e06450068d5801fc002c9650102dbf995..90b90fa33b39020189a1d4a5826fa3ab @Override diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java -index 8346db6c8521064ff51445a0da747a2d70d14633..e411da6f0f55b965fe9e303cf3b56201d33cd260 100644 +index 437a7b8ffb40c461f1778d91591fa6c4dcf36834..f973408b1f098c8a090401205f809e95fdcf2f62 100644 --- a/src/main/java/net/minecraft/server/EntityCat.java +++ b/src/main/java/net/minecraft/server/EntityCat.java @@ -63,6 +63,11 @@ public class EntityCat extends EntityTameableAnimal {