From 8c6e42583a5685fadb0a66a19c4f37e6cf9cf6ed Mon Sep 17 00:00:00 2001 From: Jake Potrebic <jake.m.potrebic@gmail.com> Date: Thu, 27 May 2021 16:24:27 -0700 Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit) (#5735) --- Spigot-API-Patches/RangedEntity-API.patch | 10 +++------- .../Implemented-BlockFailedDispenseEvent.patch | 2 +- Spigot-Server-Patches/RangedEntity-API.patch | 4 ++-- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Spigot-API-Patches/RangedEntity-API.patch b/Spigot-API-Patches/RangedEntity-API.patch index 7b8ab7a641..333c8810a5 100644 --- a/Spigot-API-Patches/RangedEntity-API.patch +++ b/Spigot-API-Patches/RangedEntity-API.patch @@ -96,16 +96,12 @@ diff --git a/src/main/java/org/bukkit/entity/Piglin.java b/src/main/java/org/buk index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/entity/Piglin.java +++ b/src/main/java/org/bukkit/entity/Piglin.java -@@ -0,0 +0,0 @@ - package org.bukkit.entity; - -+import com.destroystokyo.paper.entity.RangedEntity; // Paper -+ +@@ -0,0 +0,0 @@ import org.jetbrains.annotations.NotNull; /** * Represents a Piglin. */ --public interface Piglin extends PiglinAbstract { -+public interface Piglin extends PiglinAbstract, RangedEntity { // Paper +-public interface Piglin extends PiglinAbstract, InventoryHolder { ++public interface Piglin extends PiglinAbstract, InventoryHolder, com.destroystokyo.paper.entity.RangedEntity { // Paper /** * Get whether the piglin is able to hunt hoglins. diff --git a/Spigot-Server-Patches/Implemented-BlockFailedDispenseEvent.patch b/Spigot-Server-Patches/Implemented-BlockFailedDispenseEvent.patch index 418a08e302..5f1cd02f52 100644 --- a/Spigot-Server-Patches/Implemented-BlockFailedDispenseEvent.patch +++ b/Spigot-Server-Patches/Implemented-BlockFailedDispenseEvent.patch @@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 import org.bukkit.event.Event; import org.bukkit.event.Event.Result; @@ -0,0 +0,0 @@ public class CraftEventFactory { - + Bukkit.getPluginManager().callEvent(event); return event; } + diff --git a/Spigot-Server-Patches/RangedEntity-API.patch b/Spigot-Server-Patches/RangedEntity-API.patch index 86d50dde4f..158cce5cc6 100644 --- a/Spigot-Server-Patches/RangedEntity-API.patch +++ b/Spigot-Server-Patches/RangedEntity-API.patch @@ -95,9 +95,9 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java b/src/ index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java -@@ -0,0 +0,0 @@ import org.bukkit.craftbukkit.CraftServer; - import org.bukkit.entity.EntityType; +@@ -0,0 +0,0 @@ import org.bukkit.entity.EntityType; import org.bukkit.entity.Piglin; + import org.bukkit.inventory.Inventory; -public class CraftPiglin extends CraftPiglinAbstract implements Piglin { +public class CraftPiglin extends CraftPiglinAbstract implements Piglin, com.destroystokyo.paper.entity.CraftRangedEntity<EntityPiglin> { // Paper diff --git a/work/Bukkit b/work/Bukkit index f563167d33..0e11bc1faa 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit f563167d33eac6217c94e1cdffb1bc0bfd3031c9 +Subproject commit 0e11bc1faa72b7e23b0ad1f5de847250e06b6118 diff --git a/work/CraftBukkit b/work/CraftBukkit index afa0678e1b..fd905ab527 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit afa0678e1b9efcc2fdd3f3ecbecfb7fed22dd218 +Subproject commit fd905ab5279bb3fcc0970ff4306288399d09d127