diff --git a/Spigot-Server-Patches/0110-Add-getEntity-by-UUID-API.patch b/Spigot-Server-Patches/0110-Add-getEntity-by-UUID-API.patch index 45ee5f102c..44833f81e4 100644 --- a/Spigot-Server-Patches/0110-Add-getEntity-by-UUID-API.patch +++ b/Spigot-Server-Patches/0110-Add-getEntity-by-UUID-API.patch @@ -1,11 +1,11 @@ -From 62a310de3066ba26bb9498a0d9e322fc5da49505 Mon Sep 17 00:00:00 2001 +From 20dffc64e29b1d40122a76c32012992ea674346c Mon Sep 17 00:00:00 2001 From: DemonWav Date: Wed, 30 Mar 2016 01:20:11 -0500 Subject: [PATCH] Add getEntity by UUID API diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d1d268f..ac8dd76 100644 +index d1d268f..35a8602 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1508,6 +1508,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs @@ -21,7 +21,7 @@ index d1d268f..ac8dd76 100644 Entity entity = worldserver.getEntity(uuid); - if (entity != null) { -+ if (entity != null && entity.isAlive()) { ++ if (entity != null && !entity.dead) { return entity; } }