diff options
author | Jason <[email protected]> | 2021-07-18 00:41:53 -0700 |
---|---|---|
committer | GitHub <[email protected]> | 2021-07-18 09:41:53 +0200 |
commit | bc127ea819df17e60ecb76e3cd0abec730422de1 (patch) | |
tree | bcf31e42e6fbe776c47d226a140efa939e38e1f6 /patches/server/0204-WitchReadyPotionEvent.patch | |
parent | 8f949511b8394c4ecbb722e1c969a552c6ac00cc (diff) | |
download | Paper-bc127ea819df17e60ecb76e3cd0abec730422de1.tar.gz Paper-bc127ea819df17e60ecb76e3cd0abec730422de1.zip |
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6222)
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
Bukkit Changes:
eec4aab0 SPIGOT-6657: Add getPlayer to SheepDyeWoolEvent
205213c6 SPIGOT-6656: CauldronLevelChangeEvent is not fired correctly when dripstone fills the cauldron
CraftBukkit Changes:
b8c522d5 SPIGOT-6657: Add getPlayer to SheepDyeWoolEvent
f04a77dc SPIGOT-6656: CauldronLevelChangeEvent is not fired correctly when dripstone fills the cauldron
d1dbcebc SPIGOT-6653: Canceling snow bucket placement removes snow from bucket
4f34a67b #891: Fix scheduler task ID overflow and duplication issues
Spigot Changes:
d03d7f12 BUILDTOOLS-604: Rebuild patches
Diffstat (limited to 'patches/server/0204-WitchReadyPotionEvent.patch')
-rw-r--r-- | patches/server/0204-WitchReadyPotionEvent.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/patches/server/0204-WitchReadyPotionEvent.patch b/patches/server/0204-WitchReadyPotionEvent.patch index 62a6ed06e9..bcca7dee08 100644 --- a/patches/server/0204-WitchReadyPotionEvent.patch +++ b/patches/server/0204-WitchReadyPotionEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] WitchReadyPotionEvent diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java -index e2762c6c37975eb2da59d408998a5c0368c146d1..5e2e8cb5eba4ba36065f07abed954b2aad022321 100644 +index 29c4ce6ae511833fd591d3bf8cceac910a429853..e26ce4d8b3a3af8d6347f8c8c36703aeb06da520 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Witch.java +++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java @@ -157,7 +157,11 @@ public class Witch extends Raider implements RangedAttackMob { |