diff --git a/Spigot-API-Patches/WitchThrowPotionEvent.patch b/Spigot-API-Patches/WitchThrowPotionEvent.patch
new file mode 100644
index 0000000000..6cd52985c2
--- /dev/null
+++ b/Spigot-API-Patches/WitchThrowPotionEvent.patch
@@ -0,0 +1,81 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Wed, 16 May 2018 20:39:09 -0400
+Subject: [PATCH] WitchThrowPotionEvent
+
+Fired when a witch throws a potion at a player
+
+diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java
+index 6ef6367b..2f4ce49e 100644
+--- a/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java
++++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java
+@@ -0,0 +0,0 @@
+ package com.destroystokyo.paper.event.entity;
+ 
++import org.bukkit.entity.Player;
++import org.bukkit.entity.Witch;
+ import org.bukkit.event.Cancellable;
+-import org.bukkit.event.Event;
+ import org.bukkit.event.HandlerList;
++import org.bukkit.event.entity.EntityEvent;
++import org.bukkit.inventory.ItemStack;
+ 
+-public class WitchThrowPotionEvent extends Event implements Cancellable {
+-    public WitchThrowPotionEvent() {
++/**
++ * Fired when a witch throws a potion at a player
++ */
++public class WitchThrowPotionEvent extends EntityEvent implements Cancellable {
++    private final Player target;
++    private ItemStack potion;
++
++    public WitchThrowPotionEvent(Witch witch, Player target, ItemStack potion) {
++        super(witch);
++        this.target = target;
++        this.potion = potion;
+     }
+ 
++    @Override
++    public Witch getEntity() {
++        return (Witch) super.getEntity();
++    }
++
++    /**
++     * @return The target of the potion
++     */
++    public Player getTarget() {
++        return target;
++    }
++
++    /**
++     * @return The potion the witch will throw at a player
++     */
++    public ItemStack getPotion() {
++        return potion;
++    }
++
++    /**
++     * Sets the potion to be thrown at a player
++     * @param potion The potion
++     */
++    public void setPotion(ItemStack potion) {
++        this.potion = potion != null ? potion.clone() : null;
++    }
+ 
+     private static final HandlerList handlers = new HandlerList();
+ 
+@@ -0,0 +0,0 @@ public class WitchThrowPotionEvent extends Event implements Cancellable {
+ 
+     private boolean cancelled = false;
+ 
++    /**
++     * @return Event was cancelled or potion was null
++     */
+     @Override
+     public boolean isCancelled() {
+-        return cancelled;
++        return cancelled || potion == null;
+     }
+ 
+     @Override
+--
\ No newline at end of file
diff --git a/Spigot-Server-Patches/WitchThrowPotionEvent.patch b/Spigot-Server-Patches/WitchThrowPotionEvent.patch
new file mode 100644
index 0000000000..3a9b868f9f
--- /dev/null
+++ b/Spigot-Server-Patches/WitchThrowPotionEvent.patch
@@ -0,0 +1,29 @@
+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/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
+@@ -0,0 +0,0 @@ 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);
+--
\ No newline at end of file