core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make getEntity dead check more specific

This commit is contained in:
Zach Brown 2016-08-28 00:46:21 -05:00
parent ba4aaaa607
commit 8e220b8ef9
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-Server-Patches/0110-Add-getEntity-by-UUID-API.patch
View File

@ -1,11 +1,11 @@
From 62a310de3066ba26bb9498a0d9e322fc5da49505 Mon Sep 17 00:00:00 2001 From 20dffc64e29b1d40122a76c32012992ea674346c Mon Sep 17 00:00:00 2001
From: DemonWav <demonwav@gmail.com> From: DemonWav <demonwav@gmail.com>
Date: Wed, 30 Mar 2016 01:20:11 -0500 Date: Wed, 30 Mar 2016 01:20:11 -0500
Subject: [PATCH] Add getEntity by UUID API 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 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 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/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 @@ -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); Entity entity = worldserver.getEntity(uuid);
- if (entity != null) { - if (entity != null) {
+ if (entity != null && entity.isAlive()) { + if (entity != null && !entity.dead) {
return entity; return entity;
} }
} }