2019-05-05 21:39:51 +00:00
|
|
|
From e294e9bfa44c71ce198af03348d27b48949fb2c7 Mon Sep 17 00:00:00 2001
|
2019-03-24 05:00:55 +00:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Sun, 24 Mar 2019 00:24:52 -0400
|
|
|
|
Subject: [PATCH] Entity#getEntitySpawnReason
|
|
|
|
|
|
|
|
Allows you to return the SpawnReason for why an Entity Spawned
|
|
|
|
|
|
|
|
Pre existing entities will return NATURAL if it was a non
|
|
|
|
persistenting Living Entity, SPAWNER for spawners,
|
|
|
|
or DEFAULT since data was not stored.
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
2019-05-05 17:19:34 +00:00
|
|
|
index f945a2df48..cad8613a9b 100644
|
2019-03-24 05:00:55 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
2019-05-05 17:19:34 +00:00
|
|
|
@@ -65,6 +65,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
2019-03-24 05:00:55 +00:00
|
|
|
}
|
|
|
|
};
|
|
|
|
List<Entity> entitySlice = null;
|
|
|
|
+ public org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason spawnReason;
|
|
|
|
// Paper end
|
|
|
|
static boolean isLevelAtLeast(NBTTagCompound tag, int level) {
|
|
|
|
return tag.hasKey("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
|
2019-05-05 17:19:34 +00:00
|
|
|
@@ -1579,6 +1580,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
2019-03-24 05:00:55 +00:00
|
|
|
if (origin != null) {
|
|
|
|
nbttagcompound.set("Paper.Origin", this.createList(origin.getX(), origin.getY(), origin.getZ()));
|
|
|
|
}
|
|
|
|
+ if (spawnReason != null) {
|
|
|
|
+ nbttagcompound.setString("Paper.SpawnReason", spawnReason.name());
|
|
|
|
+ }
|
|
|
|
// Save entity's from mob spawner status
|
|
|
|
if (spawnedViaMobSpawner) {
|
|
|
|
nbttagcompound.setBoolean("Paper.FromMobSpawner", true);
|
2019-05-05 17:19:34 +00:00
|
|
|
@@ -1712,6 +1716,26 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
2019-03-24 05:00:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
spawnedViaMobSpawner = nbttagcompound.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status
|
|
|
|
+ if (nbttagcompound.hasKey("Paper.SpawnReason")) {
|
|
|
|
+ String spawnReasonName = nbttagcompound.getString("Paper.SpawnReason");
|
|
|
|
+ try {
|
|
|
|
+ spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.valueOf(spawnReasonName);
|
|
|
|
+ } catch (Exception ignored) {
|
|
|
|
+ LogManager.getLogger().error("Unknown SpawnReason " + spawnReasonName + " for " + this);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ if (spawnReason == null) {
|
|
|
|
+ if (spawnedViaMobSpawner) {
|
|
|
|
+ spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER;
|
2019-05-05 17:19:34 +00:00
|
|
|
+ } else if (this instanceof EntityInsentient && (this instanceof EntityAnimal || this instanceof EntityFish) && !((EntityInsentient) this).isTypeNotPersistent(0.0)) {
|
2019-03-24 05:00:55 +00:00
|
|
|
+ if (!nbttagcompound.getBoolean("PersistenceRequired")) {
|
|
|
|
+ spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ if (spawnReason == null) {
|
|
|
|
+ spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT;
|
|
|
|
+ }
|
|
|
|
// Paper end
|
|
|
|
|
|
|
|
} catch (Throwable throwable) {
|
2019-03-24 17:55:27 +00:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
2019-05-05 17:19:34 +00:00
|
|
|
index 7d93715424..3d1c910ccf 100644
|
2019-03-24 17:55:27 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
2019-05-05 17:19:34 +00:00
|
|
|
@@ -248,7 +248,7 @@ public abstract class PlayerList {
|
|
|
|
// CraftBukkit start
|
|
|
|
WorldServer finalWorldServer = worldserver;
|
|
|
|
Entity entity = EntityTypes.a(nbttagcompound1.getCompound("Entity"), finalWorldServer, (entity1) -> {
|
|
|
|
- return !finalWorldServer.addEntitySerialized(entity1) ? null : entity1;
|
|
|
|
+ return !finalWorldServer.addEntitySerialized(entity1, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.MOUNT) ? null : entity1; // Paper
|
|
|
|
// CraftBukkit end
|
|
|
|
});
|
2019-03-24 17:55:27 +00:00
|
|
|
|
2019-05-05 17:19:34 +00:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
2019-05-05 21:39:51 +00:00
|
|
|
index ef706f66e4..a296b0c2c7 100644
|
2019-05-05 17:19:34 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
|
|
|
@@ -939,6 +939,7 @@ public class WorldServer extends World {
|
|
|
|
// CraftBukkit start
|
|
|
|
private boolean addEntity0(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) {
|
|
|
|
org.spigotmc.AsyncCatcher.catchOp( "entity add"); // Spigot
|
|
|
|
+ if (entity.spawnReason == null) entity.spawnReason = spawnReason; // Paper
|
|
|
|
if (entity.valid) { MinecraftServer.LOGGER.error("Attempted Double World add on " + entity, new Throwable()); return true; } // Paper
|
|
|
|
if (entity.dead) {
|
|
|
|
// Paper start
|
2019-03-24 05:00:55 +00:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
2019-05-05 21:39:51 +00:00
|
|
|
index 0119c96066..ed5217b4ee 100644
|
2019-03-24 05:00:55 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
2019-05-05 21:39:51 +00:00
|
|
|
@@ -988,5 +988,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
2019-03-24 05:00:55 +00:00
|
|
|
public boolean fromMobSpawner() {
|
|
|
|
return getHandle().spawnedViaMobSpawner;
|
|
|
|
}
|
|
|
|
+
|
2019-05-05 17:19:34 +00:00
|
|
|
+ @Override
|
2019-03-24 05:00:55 +00:00
|
|
|
+ public org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason() {
|
|
|
|
+ return getHandle().spawnReason;
|
|
|
|
+ }
|
|
|
|
// Paper end
|
|
|
|
}
|
|
|
|
--
|
|
|
|
2.21.0
|
|
|
|
|