32 lines
1.6 KiB
Diff
32 lines
1.6 KiB
Diff
|
From f449fff0a099790efb09046533d21718cd49db9d 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 3a00a37eb..f51989588 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/EntityWitch.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/EntityWitch.java
|
||
|
|
@@ -158,7 +158,15 @@ public class EntityWitch extends EntityMonster implements IRangedEntity {
|
||
|
|
potionregistry = Potions.I;
|
||
|
|
}
|
||
|
|
|
||
|
|
- 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.Player) 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.17.0
|
||
|
|
|