Paper/patches/server/0148-Entity-fromMobSpawner.patch

67 lines
3.5 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 18 Jun 2017 18:17:05 -0500
Subject: [PATCH] Entity#fromMobSpawner()
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
2024-04-24 03:25:14 +02:00
index 9f906e51f236e84f6cee8eba4b7587edee7ce796..e612921a7fb68dd74d8fd4084a8beccc299ff6ea 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
2024-04-24 03:25:14 +02:00
@@ -397,6 +397,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
public void inactiveTick() { }
2021-06-11 14:02:28 +02:00
// Spigot end
protected int numCollisions = 0; // Paper - Cap entity collisions
+ public boolean spawnedViaMobSpawner; // Paper - Yes this name is similar to above, upstream took the better one
// Paper start - Entity origin API
@javax.annotation.Nullable
private org.bukkit.util.Vector origin;
2024-04-24 03:25:14 +02:00
@@ -2190,6 +2191,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
2023-12-05 23:12:48 +01:00
nbttagcompound.put("Paper.Origin", this.newDoubleList(origin.getX(), origin.getY(), origin.getZ()));
2021-06-11 14:02:28 +02:00
}
+ // Save entity's from mob spawner status
+ if (spawnedViaMobSpawner) {
2023-12-06 19:36:49 +01:00
+ nbttagcompound.putBoolean("Paper.FromMobSpawner", true);
2021-06-11 14:02:28 +02:00
+ }
// Paper end
2023-12-05 23:12:48 +01:00
return nbttagcompound;
2021-06-11 14:02:28 +02:00
} catch (Throwable throwable) {
2024-04-24 03:25:14 +02:00
@@ -2330,6 +2335,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
this.originWorld = originWorld;
2021-06-17 19:11:00 +02:00
origin = new org.bukkit.util.Vector(originTag.getDouble(0), originTag.getDouble(1), originTag.getDouble(2));
2021-06-11 14:02:28 +02:00
}
+
2021-06-12 13:18:01 +02:00
+ spawnedViaMobSpawner = nbt.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status
2021-06-11 14:02:28 +02:00
// 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
2024-04-24 03:25:14 +02:00
index aa54237205989f619ac6a3faa2e4285427b9e31d..43d399e1a0ba2fb0541f851a28032fa60fc01b33 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
+++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
2024-04-24 03:25:14 +02:00
@@ -176,6 +176,7 @@ public abstract class BaseSpawner {
// Spigot End
}
+ entity.spawnedViaMobSpawner = true; // Paper
// CraftBukkit start
if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, pos).isCancelled()) {
continue;
2021-06-11 14:02:28 +02:00
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
2024-04-24 03:25:14 +02:00
index 3390033bbfc8fd0715458e5faa6a65477272a80b..88e0ac38214c537ea8be5d23a17ac5a58acd3682 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
2024-04-24 03:25:14 +02:00
@@ -993,4 +993,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return originVector.toLocation(world);
2021-06-11 14:02:28 +02:00
}
// Paper end - entity origin API
2021-06-11 14:02:28 +02:00
+
+ // Paper start - Entity#fromMobSpawner
2021-06-11 14:02:28 +02:00
+ @Override
+ public boolean fromMobSpawner() {
+ return this.getHandle().spawnedViaMobSpawner;
2021-06-11 14:02:28 +02:00
+ }
+ // Paper end - Entity#fromMobSpawner
2021-06-11 14:02:28 +02:00
}