SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make SentientNPC extend LivingEntity

Browse Source
This commit is contained in:
Aikar
2018-06-16 14:28:13 -04:00
parent 3368739906
commit 488c39f0f4
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-API-Patches/Add-SentientNPC-Interface-to-Entities.patch
View File

@@ -14,7 +14,7 @@ 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 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 new file mode 100644
index 00000000..a0bdf855 index 00000000..231e8af1
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/entity/SentientNPC.java +++ b/src/main/java/com/destroystokyo/paper/entity/SentientNPC.java
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@
@@ -43,6 +43,8 @@ index 00000000..a0bdf855
+ +
+package com.destroystokyo.paper.entity; +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 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. + * 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. + * 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 diff --git a/src/main/java/org/bukkit/entity/Ambient.java b/src/main/java/org/bukkit/entity/Ambient.java
index 779e3897..ef548fb4 100644 index 779e3897..ef548fb4 100644