mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 15:30:19 +01:00
05466e3b47
Upstream has released updates that appear to apply compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing. Bukkit Changes: d2834556 SPIGOT-4219: Event for PigZombies angering. CraftBukkit Changes:a9c796f1SPIGOT-4184: Fix furnaces not matching Vanilla smelt or animations195f071eSPIGOT-4219: Event for PigZombies angering.5e3082c7SPIGOT-4230: Improve legacy block types
31 lines
1.6 KiB
Diff
31 lines
1.6 KiB
Diff
From bc07d9c6a79d5f349e261bd83b9af5d948fba703 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Wed, 16 May 2018 20:44:58 -0400
|
|
Subject: [PATCH] WitchThrowPotionEvent
|
|
|
|
Fired when a witch throws a potion at a player
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
|
|
index 790ab11c17..9d802be18a 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityWitch.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityWitch.java
|
|
@@ -154,7 +154,15 @@ public class EntityWitch extends EntityMonster implements IRangedEntity {
|
|
potionregistry = Potions.M;
|
|
}
|
|
|
|
- EntityPotion entitypotion = new EntityPotion(this.world, this, PotionUtil.a(new ItemStack(Items.SPLASH_POTION), potionregistry));
|
|
+ // Paper start
|
|
+ ItemStack potion = PotionUtil.a(new ItemStack(Items.SPLASH_POTION), potionregistry);
|
|
+ com.destroystokyo.paper.event.entity.WitchThrowPotionEvent event = new com.destroystokyo.paper.event.entity.WitchThrowPotionEvent((org.bukkit.entity.Witch) this.getBukkitEntity(), (org.bukkit.entity.LivingEntity) entityliving.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(potion));
|
|
+ if (!event.callEvent()) {
|
|
+ return;
|
|
+ }
|
|
+ potion = org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getPotion());
|
|
+ EntityPotion entitypotion = new EntityPotion(this.world, this, potion);
|
|
+ // Paper end
|
|
|
|
entitypotion.pitch -= -20.0F;
|
|
entitypotion.shoot(d1, d2 + (double) (f1 * 0.2F), d3, 0.75F, 8.0F);
|
|
--
|
|
2.18.0
|
|
|