diff --git a/Spigot-API-Patches/0112-Add-SentientNPC-Interface-to-Entities.patch b/Spigot-API-Patches/0112-Add-SentientNPC-Interface-to-Entities.patch index df5b60b327..1b175e145d 100644 --- a/Spigot-API-Patches/0112-Add-SentientNPC-Interface-to-Entities.patch +++ b/Spigot-API-Patches/0112-Add-SentientNPC-Interface-to-Entities.patch @@ -1,4 +1,4 @@ -From 8290a8cef4bf55a6db5d39202d919ef8b1c38d4e Mon Sep 17 00:00:00 2001 +From 7c17fe406f21ecc522cc1a3a1b1d86babcdf66ff Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 16 Jun 2018 13:41:00 -0400 Subject: [PATCH] Add SentientNPC Interface to Entities @@ -14,10 +14,10 @@ This interface lets you identify NPC entities capable of sentience, and able to diff --git a/src/main/java/com/destroystokyo/paper/entity/SentientNPC.java b/src/main/java/com/destroystokyo/paper/entity/SentientNPC.java new file mode 100644 -index 00000000..a0bdf855 +index 00000000..231e8af1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/SentientNPC.java -@@ -0,0 +1,37 @@ +@@ -0,0 +1,39 @@ +/* + * Copyright (c) 2018 Daniel Ennis (Aikar) MIT License + * @@ -43,6 +43,8 @@ index 00000000..a0bdf855 + +package com.destroystokyo.paper.entity; + ++import org.bukkit.entity.LivingEntity; ++ +/** + * Used to determine ACTUAL Living NPC's. Spigot mistakenly inversed the conditions for LivingEntity, and + * used LivingEntity for Insentient Entities, and named the actual EntityLiving class EntityInsentient. @@ -53,7 +55,7 @@ index 00000000..a0bdf855 + * + * This interface lets you identify NPC entities capable of sentience, and able to move about and react to the world. + */ -+public interface SentientNPC { ++public interface SentientNPC extends LivingEntity { +} diff --git a/src/main/java/org/bukkit/entity/Ambient.java b/src/main/java/org/bukkit/entity/Ambient.java index 779e3897..ef548fb4 100644