Fix server crash with piercing shots through vanished players (#2390)

This commit is contained in:
Nassim 2019-08-01 00:04:45 +02:00 committed by Shane Freeder
parent 93891ad57a
commit c80ba8dcc4

View file

@ -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