PaperMC/patches/server/0195-WitchThrowPotionEvent.patch

31 lines
1.8 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 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/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
2024-04-24 04:21:40 +02:00
index 3e070a61a3099601e57d70ec663c4c6fb291c024..c7470a5b95ee25078296c0443630c88a371b8a6f 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
2024-04-24 04:21:40 +02:00
@@ -229,9 +229,16 @@ public class Witch extends Raider implements RangedAttackMob {
holder = Potions.WEAKNESS;
2021-06-11 14:02:28 +02:00
}
2023-09-22 00:01:00 +02:00
+ // Paper start - WitchThrowPotionEvent
2024-04-24 04:21:40 +02:00
+ ItemStack potion = PotionContents.createItemStack(Items.SPLASH_POTION, holder);
2021-06-11 14:02:28 +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) target.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(potion));
+ if (!event.callEvent()) {
+ return;
+ }
+ potion = org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getPotion());
2023-06-07 21:54:11 +02:00
ThrownPotion entitypotion = new ThrownPotion(this.level(), this);
2021-06-11 14:02:28 +02:00
-
2024-04-24 04:21:40 +02:00
- entitypotion.setItem(PotionContents.createItemStack(Items.SPLASH_POTION, holder));
2021-06-11 14:02:28 +02:00
+ entitypotion.setItem(potion);
+ // Paper end - WitchThrowPotionEvent
2021-06-12 21:30:37 +02:00
entitypotion.setXRot(entitypotion.getXRot() - -20.0F);
entitypotion.shoot(d0, d1 + d3 * 0.2D, d2, 0.75F, 8.0F);
2021-06-11 14:02:28 +02:00
if (!this.isSilent()) {