2020-04-02 23:07:06 +02:00
|
|
|
From a82024e65858dc3a1817b54e7a6e7fe845601021 Mon Sep 17 00:00:00 2001
|
2018-05-17 02:49:47 +02:00
|
|
|
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
|
2020-04-02 23:07:06 +02:00
|
|
|
index aa90111716..1f2759e95e 100644
|
2018-05-17 02:49:47 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityWitch.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityWitch.java
|
2019-04-29 05:14:31 +02:00
|
|
|
@@ -185,9 +185,16 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
|
2019-05-28 01:01:45 +02:00
|
|
|
potionregistry = Potions.WEAKNESS;
|
2018-05-17 02:49:47 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start
|
|
|
|
+ ItemStack potion = PotionUtil.a(new ItemStack(Items.SPLASH_POTION), potionregistry);
|
2018-05-24 05:08:04 +02:00
|
|
|
+ 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));
|
2018-05-17 02:49:47 +02:00
|
|
|
+ if (!event.callEvent()) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ potion = org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getPotion());
|
2019-04-29 05:14:31 +02:00
|
|
|
EntityPotion entitypotion = new EntityPotion(this.world, this);
|
|
|
|
-
|
|
|
|
- entitypotion.setItem(PotionUtil.a(new ItemStack(Items.SPLASH_POTION), potionregistry));
|
|
|
|
+ entitypotion.setItem(potion);
|
2018-05-17 02:49:47 +02:00
|
|
|
+ // Paper end
|
|
|
|
entitypotion.pitch -= -20.0F;
|
2019-04-29 05:14:31 +02:00
|
|
|
entitypotion.shoot(d0, d1 + (double) (f1 * 0.2F), d2, 0.75F, 8.0F);
|
2019-12-12 00:43:22 +01:00
|
|
|
this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_WITCH_THROW, this.getSoundCategory(), 1.0F, 0.8F + this.random.nextFloat() * 0.4F);
|
2018-05-17 02:49:47 +02:00
|
|
|
--
|
2020-04-02 23:07:06 +02:00
|
|
|
2.25.1
|
2018-05-17 02:49:47 +02:00
|
|
|
|