Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-22 10:35:38 +01:00
Code Issues Projects Releases Wiki Activity

[Auto] Updated Upstream (CraftBukkit)

Browse Source 
Upstream has released updates that appear 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:
7ea8b96b4 #826: Make dispenser trigger fertilize event
This commit is contained in:
Aikar 2021-05-03 04:42:29 -04:00
parent 976c6d425b
commit 99a66a5838
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

4
Spigot-Server-Patches/0358-Catch-exceptions-from-dispenser-entity-spawns.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Catch exceptions from dispenser entity spawns
diff --git a/src/main/java/net/minecraft/core/dispenser/IDispenseBehavior.java b/src/main/java/net/minecraft/core/dispenser/IDispenseBehavior.java diff --git a/src/main/java/net/minecraft/core/dispenser/IDispenseBehavior.java b/src/main/java/net/minecraft/core/dispenser/IDispenseBehavior.java
index ffce5baaca6fd5b5e73ed898d12a4fee02c24515..158075319bd49ac78ea994639cdad21aeacdf86f 100644 index a7d690cb2289a79ee2b8fc665caef58a10ddab3e..50911632341d1b861c00f01077cae43884147fe0 100644
--- a/src/main/java/net/minecraft/core/dispenser/IDispenseBehavior.java --- a/src/main/java/net/minecraft/core/dispenser/IDispenseBehavior.java
+++ b/src/main/java/net/minecraft/core/dispenser/IDispenseBehavior.java +++ b/src/main/java/net/minecraft/core/dispenser/IDispenseBehavior.java
@@ -8,6 +8,7 @@ import net.minecraft.core.BlockPosition; @@ -8,6 +8,7 @@ import net.minecraft.core.BlockPosition;
@ -16,7 +16,7 @@ index ffce5baaca6fd5b5e73ed898d12a4fee02c24515..158075319bd49ac78ea994639cdad21a
import net.minecraft.server.level.EntityPlayer; import net.minecraft.server.level.EntityPlayer;
import net.minecraft.server.level.WorldServer; import net.minecraft.server.level.WorldServer;
import net.minecraft.sounds.SoundCategory; import net.minecraft.sounds.SoundCategory;
@@ -236,7 +237,14 @@ public interface IDispenseBehavior { @@ -237,7 +238,14 @@ public interface IDispenseBehavior {
} }
} }

4
Spigot-Server-Patches/0398-Fix-last-firework-in-stack-not-having-effects-when-d.patch
View File

@ -9,10 +9,10 @@ dispensed. The resulting item would have size == 0 and therefore
be convertered to air, hence why the effects disappeared. be convertered to air, hence why the effects disappeared.
diff --git a/src/main/java/net/minecraft/core/dispenser/IDispenseBehavior.java b/src/main/java/net/minecraft/core/dispenser/IDispenseBehavior.java diff --git a/src/main/java/net/minecraft/core/dispenser/IDispenseBehavior.java b/src/main/java/net/minecraft/core/dispenser/IDispenseBehavior.java
index 158075319bd49ac78ea994639cdad21aeacdf86f..93093c05da53e5ddc59fac179081af2e0893706d 100644 index 50911632341d1b861c00f01077cae43884147fe0..0055a96b51a1d38d31e129c417c97bcfc9d0b745 100644
--- a/src/main/java/net/minecraft/core/dispenser/IDispenseBehavior.java --- a/src/main/java/net/minecraft/core/dispenser/IDispenseBehavior.java
+++ b/src/main/java/net/minecraft/core/dispenser/IDispenseBehavior.java +++ b/src/main/java/net/minecraft/core/dispenser/IDispenseBehavior.java
@@ -426,7 +426,7 @@ public interface IDispenseBehavior { @@ -427,7 +427,7 @@ public interface IDispenseBehavior {
} }
itemstack1 = CraftItemStack.asNMSCopy(event.getItem()); itemstack1 = CraftItemStack.asNMSCopy(event.getItem());

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 95544a2da8707a3b3ee758e346da9ab063f1dbb2 Subproject commit 7ea8b96b4a9a168723d1eb109c5abc6fe91b78d6