aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0305-Entity-getEntitySpawnReason.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0305-Entity-getEntitySpawnReason.patch')
-rw-r--r--patches/server/0305-Entity-getEntitySpawnReason.patch121
1 files changed, 121 insertions, 0 deletions
diff --git a/patches/server/0305-Entity-getEntitySpawnReason.patch b/patches/server/0305-Entity-getEntitySpawnReason.patch
new file mode 100644
index 0000000000..8b9a1f882b
--- /dev/null
+++ b/patches/server/0305-Entity-getEntitySpawnReason.patch
@@ -0,0 +1,121 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <[email protected]>
+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/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
+index efc2db1b27e9ac4b1094b7e529c198a94d05b164..84eeb8787c389a3c66b23d567f6c2ebe9644a1ce 100644
+--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
++++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
+@@ -1250,6 +1250,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+ return true;
+ }
+ // Paper end
++ if (entity.spawnReason == null) entity.spawnReason = spawnReason; // Paper
+ if (entity.isRemoved()) {
+ // Paper start
+ if (DEBUG_ENTITIES) {
+diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
+index 45cd4ac70bf322a3bb256579f795db46b9beb7a0..80b6eb1e010559c02c9e7624a5c131d11c80c68e 100644
+--- a/src/main/java/net/minecraft/server/players/PlayerList.java
++++ b/src/main/java/net/minecraft/server/players/PlayerList.java
+@@ -348,7 +348,7 @@ public abstract class PlayerList {
+ // CraftBukkit start
+ ServerLevel finalWorldServer = worldserver1;
+ Entity entity = EntityType.loadEntityRecursive(nbttagcompound1.getCompound("Entity"), finalWorldServer, (entity1) -> {
+- return !finalWorldServer.addWithUUID(entity1) ? null : entity1;
++ return !finalWorldServer.addWithUUID(entity1, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.MOUNT) ? null : entity1; // Paper
+ // CraftBukkit end
+ });
+
+diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+index e6fa82b942ec176288aaca080e3d9c8df6a16ac0..fa128e7f8089339f932e19edf95a8d5c0cc14046 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -74,6 +74,8 @@ import net.minecraft.world.InteractionHand;
+ import net.minecraft.world.InteractionResult;
+ import net.minecraft.world.Nameable;
+ import net.minecraft.world.damagesource.DamageSource;
++import net.minecraft.world.entity.animal.AbstractFish;
++import net.minecraft.world.entity.animal.Animal;
+ import net.minecraft.world.entity.item.ItemEntity;
+ import net.minecraft.world.entity.player.Player;
+ import net.minecraft.world.entity.vehicle.Boat;
+@@ -231,6 +233,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+ }
+ }
+ // Paper end
++ public org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason spawnReason; // Paper
+
+ public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper
+ private CraftEntity bukkitEntity;
+@@ -2023,6 +2026,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+ }
+ nbt.put("Paper.Origin", this.newDoubleList(origin.getX(), origin.getY(), origin.getZ()));
+ }
++ if (spawnReason != null) {
++ nbt.putString("Paper.SpawnReason", spawnReason.name());
++ }
+ // Save entity's from mob spawner status
+ if (spawnedViaMobSpawner) {
+ nbt.putBoolean("Paper.FromMobSpawner", true);
+@@ -2168,6 +2174,26 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+ }
+
+ spawnedViaMobSpawner = nbt.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status
++ if (nbt.contains("Paper.SpawnReason")) {
++ String spawnReasonName = nbt.getString("Paper.SpawnReason");
++ try {
++ spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.valueOf(spawnReasonName);
++ } catch (Exception ignored) {
++ LOGGER.error("Unknown SpawnReason " + spawnReasonName + " for " + this);
++ }
++ }
++ if (spawnReason == null) {
++ if (spawnedViaMobSpawner) {
++ spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER;
++ } else if (this instanceof Mob && (this instanceof Animal || this instanceof AbstractFish) && !((Mob) this).removeWhenFarAway(0.0)) {
++ if (!nbt.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) {
+diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
+index 0be0c7a323277093a6f8e476048eb9ee8712cbc9..c7e97263eee005fd673882e11c436542cb0ca62a 100644
+--- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
++++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
+@@ -181,6 +181,7 @@ public abstract class BaseSpawner {
+ // Spigot End
+ }
+ entity.spawnedViaMobSpawner = true; // Paper
++ entity.spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER; // Paper
+ flag = true; // Paper
+ // Spigot Start
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, pos).isCancelled()) {
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+index 2a4f26c5bae66121c5c21d7f1013b3b7753608a4..3bda8128c2956d817677e28ff87c9c5ed61c8bd2 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+@@ -1266,5 +1266,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+ public boolean fromMobSpawner() {
+ return getHandle().spawnedViaMobSpawner;
+ }
++
++ @Override
++ public org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason() {
++ return getHandle().spawnReason;
++ }
+ // Paper end
+ }