2020-05-06 09:48:49 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-06-06 02:48:27 +00:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
|
Date: Tue, 5 Jun 2018 22:47:26 -0400
|
|
|
|
|
Subject: [PATCH] WitchReadyPotionEvent
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
|
2020-06-25 14:09:55 +00:00
|
|
|
index 75d014ad49c701e4c693be4e2f8e7dc6d592fa5f..a6142ef24bc5bfa15a0ec84fbd8267ffab4e25bf 100644
|
2018-06-06 02:48:27 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityWitch.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityWitch.java
|
2020-06-25 14:09:55 +00:00
|
|
|
@@ -118,7 +118,11 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
|
2018-06-06 02:48:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (potionregistry != null) {
|
|
|
|
|
- this.setSlot(EnumItemSlot.MAINHAND, PotionUtil.a(new ItemStack(Items.POTION), potionregistry));
|
|
|
|
|
+ // Paper start
|
|
|
|
|
+ ItemStack potion = PotionUtil.a(new ItemStack(Items.POTION), potionregistry);
|
|
|
|
|
+ org.bukkit.inventory.ItemStack bukkitStack = com.destroystokyo.paper.event.entity.WitchReadyPotionEvent.process((org.bukkit.entity.Witch) this.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(potion));
|
|
|
|
|
+ this.setSlot(EnumItemSlot.MAINHAND, org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(bukkitStack));
|
|
|
|
|
+ // Paper end
|
2020-06-25 14:09:55 +00:00
|
|
|
this.bx = this.getItemInMainHand().k();
|
|
|
|
|
this.v(true);
|
|
|
|
|
if (!this.isSilent()) {
|
