mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-04 02:34:48 +02:00
f835a91d15
Upstream has added the equivalent of our SentientNPC API, with exception to the EnderDragon. We've added Mob to the EnderDragon, and our SentientNPC API should behave the same. Vex#getOwner has been deprecated and a replacement Vex#getSummoner has been added using Mob. However, since 1.13 is not production ready, SentientNPC API is subject for removal in 1.13.1 since 1.13 API is not compatible with 1.12. Please move to the Mob interface ASAP. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: c5ab54d8 Expand GameRule API ab9a606c Improve entity hierarchy by adding Mob interface. CraftBukkit Changes:29e75648Expand GameRule API50e6858bImprove entity hierarchy by adding Mob interface.0e1d79b4Correct error in previous patch
114 lines
5.0 KiB
Diff
114 lines
5.0 KiB
Diff
From 271f251dfa394ddcfa8ff6364ab1eeabfc84aa89 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sat, 16 Jun 2018 13:41:00 -0400
|
|
Subject: [PATCH] Add SentientNPC Interface to Entities
|
|
|
|
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.
|
|
|
|
This should of all been inversed on the implementation side. To make matters worse, Spigot never
|
|
exposed the differentiator that there are entities with AI that are not sentient/alive such as
|
|
Armor stands and Players are the only things that do not implement the REAL EntityLiving class (named Insentient internally)
|
|
|
|
This interface lets you identify NPC entities capable of sentience, and able to move about and react to the world.
|
|
|
|
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 000000000..cb8de4629
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/entity/SentientNPC.java
|
|
@@ -0,0 +1,34 @@
|
|
+/*
|
|
+ * Copyright (c) 2018 Daniel Ennis (Aikar) MIT License
|
|
+ *
|
|
+ * Permission is hereby granted, free of charge, to any person obtaining
|
|
+ * a copy of this software and associated documentation files (the
|
|
+ * "Software"), to deal in the Software without restriction, including
|
|
+ * without limitation the rights to use, copy, modify, merge, publish,
|
|
+ * distribute, sublicense, and/or sell copies of the Software, and to
|
|
+ * permit persons to whom the Software is furnished to do so, subject to
|
|
+ * the following conditions:
|
|
+ *
|
|
+ * The above copyright notice and this permission notice shall be
|
|
+ * included in all copies or substantial portions of the Software.
|
|
+ *
|
|
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
|
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
|
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
|
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
+ */
|
|
+
|
|
+package com.destroystokyo.paper.entity;
|
|
+
|
|
+import org.bukkit.entity.Mob;
|
|
+
|
|
+
|
|
+/**
|
|
+ * @deprecated Upstream has added this API. Use {@link Mob}. Will be removed in 1.13.1
|
|
+ */
|
|
+@Deprecated
|
|
+public interface SentientNPC extends Mob {
|
|
+}
|
|
diff --git a/src/main/java/org/bukkit/entity/Ambient.java b/src/main/java/org/bukkit/entity/Ambient.java
|
|
index 613830a74..4ad71c825 100644
|
|
--- a/src/main/java/org/bukkit/entity/Ambient.java
|
|
+++ b/src/main/java/org/bukkit/entity/Ambient.java
|
|
@@ -3,4 +3,4 @@ package org.bukkit.entity;
|
|
/**
|
|
* Represents an ambient mob
|
|
*/
|
|
-public interface Ambient extends Mob {}
|
|
+public interface Ambient extends Mob, com.destroystokyo.paper.entity.SentientNPC {} // Paper {}
|
|
diff --git a/src/main/java/org/bukkit/entity/Creature.java b/src/main/java/org/bukkit/entity/Creature.java
|
|
index 6c9c5e85e..c796c4dc2 100644
|
|
--- a/src/main/java/org/bukkit/entity/Creature.java
|
|
+++ b/src/main/java/org/bukkit/entity/Creature.java
|
|
@@ -4,4 +4,4 @@ package org.bukkit.entity;
|
|
* Represents a Creature. Creatures are non-intelligent monsters or animals
|
|
* which have very simple abilities.
|
|
*/
|
|
-public interface Creature extends Mob {}
|
|
+public interface Creature extends Mob, com.destroystokyo.paper.entity.SentientNPC {} // Paper
|
|
diff --git a/src/main/java/org/bukkit/entity/EnderDragon.java b/src/main/java/org/bukkit/entity/EnderDragon.java
|
|
index 4ea0e44e7..8f200e6c4 100644
|
|
--- a/src/main/java/org/bukkit/entity/EnderDragon.java
|
|
+++ b/src/main/java/org/bukkit/entity/EnderDragon.java
|
|
@@ -3,7 +3,7 @@ package org.bukkit.entity;
|
|
/**
|
|
* Represents an Ender Dragon
|
|
*/
|
|
-public interface EnderDragon extends ComplexLivingEntity {
|
|
+public interface EnderDragon extends ComplexLivingEntity, com.destroystokyo.paper.entity.SentientNPC { // Paper
|
|
|
|
/**
|
|
* Represents a phase or action that an Ender Dragon can perform.
|
|
diff --git a/src/main/java/org/bukkit/entity/Flying.java b/src/main/java/org/bukkit/entity/Flying.java
|
|
index 580ce18bf..45840ee1f 100644
|
|
--- a/src/main/java/org/bukkit/entity/Flying.java
|
|
+++ b/src/main/java/org/bukkit/entity/Flying.java
|
|
@@ -3,4 +3,4 @@ package org.bukkit.entity;
|
|
/**
|
|
* Represents a Flying Entity.
|
|
*/
|
|
-public interface Flying extends Mob {}
|
|
+public interface Flying extends Mob, com.destroystokyo.paper.entity.SentientNPC {} // Paper
|
|
diff --git a/src/main/java/org/bukkit/entity/Slime.java b/src/main/java/org/bukkit/entity/Slime.java
|
|
index 1119e26e2..46d03d29d 100644
|
|
--- a/src/main/java/org/bukkit/entity/Slime.java
|
|
+++ b/src/main/java/org/bukkit/entity/Slime.java
|
|
@@ -3,7 +3,7 @@ package org.bukkit.entity;
|
|
/**
|
|
* Represents a Slime.
|
|
*/
|
|
-public interface Slime extends Mob {
|
|
+public interface Slime extends Mob, com.destroystokyo.paper.entity.SentientNPC { // Paper
|
|
|
|
/**
|
|
* @return The size of the slime
|
|
--
|
|
2.18.0
|
|
|