From c80ba8dcc44c54db43d6aec678b30320b3e21c95 Mon Sep 17 00:00:00 2001
From: Nassim <28825609+KennyTV@users.noreply.github.com>
Date: Thu, 1 Aug 2019 00:04:45 +0200
Subject: [PATCH] Fix server crash with piercing shots through vanished players
 (#2390)

---
 Spigot-Server-Patches/0131-Add-ProjectileCollideEvent.patch | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Spigot-Server-Patches/0131-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0131-Add-ProjectileCollideEvent.patch
index 201d95a60..f6375c57c 100644
--- a/Spigot-Server-Patches/0131-Add-ProjectileCollideEvent.patch
+++ b/Spigot-Server-Patches/0131-Add-ProjectileCollideEvent.patch
@@ -8,7 +8,7 @@ diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java
 index 2b829abac..af0f5cb00 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
-@@ -184,6 +184,16 @@ public abstract class EntityArrow extends Entity implements IProjectile {
+@@ -184,6 +184,17 @@ public abstract class EntityArrow extends Entity implements IProjectile {
                      }
                  }
  
@@ -18,6 +18,7 @@ index 2b829abac..af0f5cb00 100644
 +                    com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileCollideEvent(this, (MovingObjectPositionEntity)object);
 +                    if (event.isCancelled()) {
 +                        object = null;
++                        movingobjectpositionentity = null;
 +                    }
 +                }
 +                // Paper end