diff --git a/Spigot-API-Patches/Add-spectator-target-events.patch b/Spigot-API-Patches/Add-spectator-target-events.patch
new file mode 100644
index 0000000000..1fee66a22b
--- /dev/null
+++ b/Spigot-API-Patches/Add-spectator-target-events.patch
@@ -0,0 +1,133 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Caleb Bassham <caleb.bassham@gmail.com>
+Date: Fri, 28 Sep 2018 02:30:56 -0500
+Subject: [PATCH] Add spectator target events
+
+- PlayerStartSpectatingEntityEvent
+- PlayerStopSpectatingEntityEvent
+
+diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerStartSpectatingEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerStartSpectatingEntityEvent.java
+new file mode 100644
+index 00000000..d3b7cc27
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerStartSpectatingEntityEvent.java
+@@ -0,0 +0,0 @@
++package com.destroystokyo.paper.event.player;
++
++import org.bukkit.entity.Entity;
++import org.bukkit.entity.Player;
++import org.bukkit.event.Cancellable;
++import org.bukkit.event.HandlerList;
++import org.bukkit.event.player.PlayerEvent;
++
++/**
++ * Triggered when a player starts spectating an entity in spectator mode.
++ */
++public class PlayerStartSpectatingEntityEvent extends PlayerEvent implements Cancellable {
++
++    private static final HandlerList handlers = new HandlerList();
++    private boolean cancelled;
++    private final Entity currentSpectatorTarget;
++    private final Entity newSpectatorTarget;
++
++    public PlayerStartSpectatingEntityEvent(Player player, Entity currentSpectatorTarget, Entity newSpectatorTarget) {
++        super(player);
++        this.currentSpectatorTarget = currentSpectatorTarget;
++        this.newSpectatorTarget = newSpectatorTarget;
++    }
++
++    /**
++     * Gets the entity that the player is currently spectating or themselves if they weren't spectating anything
++     *
++     * @return The entity the player is currently spectating (before they start spectating the new target).
++     */
++    public Entity getCurrentSpectatorTarget() {
++        return currentSpectatorTarget;
++    }
++
++    /**
++     * Gets the new entity that the player will now be spectating
++     *
++     * @return The entity the player is now going to be spectating.
++     */
++    public Entity getNewSpectatorTarget() {
++        return newSpectatorTarget;
++    }
++
++    @Override
++    public boolean isCancelled() {
++        return cancelled;
++    }
++
++    @Override
++    public void setCancelled(boolean cancel) {
++        this.cancelled = cancel;
++    }
++
++    @Override
++    public HandlerList getHandlers() {
++        return handlers;
++    }
++
++    public static HandlerList getHandlerList() {
++        return handlers;
++    }
++}
++
+diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerStopSpectatingEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerStopSpectatingEntityEvent.java
+new file mode 100644
+index 00000000..ce23caaf
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerStopSpectatingEntityEvent.java
+@@ -0,0 +0,0 @@
++package com.destroystokyo.paper.event.player;
++
++import org.bukkit.entity.Entity;
++import org.bukkit.entity.Player;
++import org.bukkit.event.Cancellable;
++import org.bukkit.event.HandlerList;
++import org.bukkit.event.player.PlayerEvent;
++
++/**
++ * Triggered when a player stops spectating an entity in spectator mode.
++ */
++public class PlayerStopSpectatingEntityEvent extends PlayerEvent implements Cancellable {
++
++    private static final HandlerList handlers = new HandlerList();
++    private boolean cancelled;
++    private final Entity spectatorTarget;
++
++    public PlayerStopSpectatingEntityEvent(Player player, Entity spectatorTarget) {
++        super(player);
++        this.spectatorTarget = spectatorTarget;
++    }
++
++    /**
++     * Gets the entity that the player is spectating
++     *
++     * @return The entity the player is currently spectating (before they will stop).
++     */
++    public Entity getSpectatorTarget() {
++        return spectatorTarget;
++    }
++
++    @Override
++    public boolean isCancelled() {
++        return cancelled;
++    }
++
++    @Override
++    public void setCancelled(boolean cancel) {
++        this.cancelled = cancel;
++    }
++
++    @Override
++    public HandlerList getHandlers() {
++        return handlers;
++    }
++
++    public static HandlerList getHandlerList() {
++        return handlers;
++    }
++}
+--
\ No newline at end of file
diff --git a/Spigot-Server-Patches/Call-player-spectator-target-events.patch b/Spigot-Server-Patches/Call-player-spectator-target-events.patch
new file mode 100644
index 0000000000..314e7f36f8
--- /dev/null
+++ b/Spigot-Server-Patches/Call-player-spectator-target-events.patch
@@ -0,0 +1,57 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Caleb Bassham <caleb.bassham@gmail.com>
+Date: Fri, 28 Sep 2018 02:32:19 -0500
+Subject: [PATCH] Call player spectator target events
+
+
+diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
+index 5ab4e01ed..4ca5cfe9a 100644
+--- a/src/main/java/net/minecraft/server/EntityPlayer.java
++++ b/src/main/java/net/minecraft/server/EntityPlayer.java
+@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+     private EntityHuman.EnumChatVisibility cs;
+     private boolean ct = true;
+     private long cu = SystemUtils.b();
+-    private Entity cv;
++    private Entity cv; private void setSpectatorTargetField(Entity e) { this.cv = e; } // Paper - OBFHELPER
+     public boolean worldChangeInvuln;
+     private boolean cx; private void setHasSeenCredits(boolean has) { this.cx = has; } // Paper - OBFHELPER
+     private final RecipeBookServer cy;
+@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+         return (Entity) (this.cv == null ? this : this.cv);
+     }
+ 
+-    public void setSpectatorTarget(Entity entity) {
++    public void setSpectatorTarget(Entity newSpectatorTarget) {
+         Entity entity1 = this.getSpecatorTarget();
+ 
+-        this.cv = (Entity) (entity == null ? this : entity);
+-        if (entity1 != this.cv) {
++        if (newSpectatorTarget == null) {
++            newSpectatorTarget = this;
++        }
++
++        if (entity1 != newSpectatorTarget) {
++            if (newSpectatorTarget == this) {
++                com.destroystokyo.paper.event.player.PlayerStopSpectatingEntityEvent playerStopSpectatingEntityEvent = new com.destroystokyo.paper.event.player.PlayerStopSpectatingEntityEvent(this.getBukkitEntity(), entity1.getBukkitEntity());
++
++                if (!playerStopSpectatingEntityEvent.callEvent()) {
++                    return;
++                }
++            } else {
++                com.destroystokyo.paper.event.player.PlayerStartSpectatingEntityEvent playerStartSpectatingEntityEvent = new com.destroystokyo.paper.event.player.PlayerStartSpectatingEntityEvent(this.getBukkitEntity(), entity1.getBukkitEntity(), newSpectatorTarget.getBukkitEntity());
++
++                if (!playerStartSpectatingEntityEvent.callEvent()) {
++                    return;
++                }
++            }
++
+             this.playerConnection.sendPacket(new PacketPlayOutCamera(this.cv));
+             this.playerConnection.a(this.cv.locX, this.cv.locY, this.cv.locZ, this.yaw, this.pitch, TeleportCause.SPECTATE); // CraftBukkit
+         }
+ 
++        setSpectatorTargetField(newSpectatorTarget);
+     }
+ 
+     protected void E() {
+--
\ No newline at end of file