aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0315-Mob-Spawner-API-Enhancements.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0315-Mob-Spawner-API-Enhancements.patch')
-rw-r--r--patches/server/0315-Mob-Spawner-API-Enhancements.patch99
1 files changed, 99 insertions, 0 deletions
diff --git a/patches/server/0315-Mob-Spawner-API-Enhancements.patch b/patches/server/0315-Mob-Spawner-API-Enhancements.patch
new file mode 100644
index 0000000000..0947d35c6f
--- /dev/null
+++ b/patches/server/0315-Mob-Spawner-API-Enhancements.patch
@@ -0,0 +1,99 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <[email protected]>
+Date: Fri, 19 Apr 2019 12:41:13 -0500
+Subject: [PATCH] Mob Spawner API Enhancements
+
+
+diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
+index c7e97263eee005fd673882e11c436542cb0ca62a..e3d8814cbad30da795632afddf8ebc87eff72106 100644
+--- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
++++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
+@@ -235,7 +235,13 @@ public abstract class BaseSpawner {
+ }
+
+ public void load(@Nullable Level world, BlockPos pos, CompoundTag nbt) {
++ // Paper start - use larger int if set
++ if (nbt.contains("Paper.Delay")) {
++ this.spawnDelay = nbt.getInt("Paper.Delay");
++ } else {
+ this.spawnDelay = nbt.getShort("Delay");
++ }
++ // Paper end
+ boolean flag = nbt.contains("SpawnPotentials", 9);
+ boolean flag1 = nbt.contains("SpawnData", 10);
+
+@@ -271,9 +277,15 @@ public abstract class BaseSpawner {
+ }
+ }
+
++ // Paper start - use ints if set
++ if (nbt.contains("Paper.MinSpawnDelay", 99)) {
++ this.minSpawnDelay = nbt.getInt("Paper.MinSpawnDelay");
++ this.maxSpawnDelay = nbt.getInt("Paper.MaxSpawnDelay");
++ this.spawnCount = nbt.getShort("SpawnCount");
++ } else // Paper end
+ if (nbt.contains("MinSpawnDelay", 99)) {
+- this.minSpawnDelay = nbt.getShort("MinSpawnDelay");
+- this.maxSpawnDelay = nbt.getShort("MaxSpawnDelay");
++ this.minSpawnDelay = nbt.getInt("MinSpawnDelay"); // Paper - short -> int
++ this.maxSpawnDelay = nbt.getInt("MaxSpawnDelay"); // Paper - short -> int
+ this.spawnCount = nbt.getShort("SpawnCount");
+ }
+
+@@ -290,9 +302,20 @@ public abstract class BaseSpawner {
+ }
+
+ public CompoundTag save(CompoundTag nbt) {
+- nbt.putShort("Delay", (short) this.spawnDelay);
+- nbt.putShort("MinSpawnDelay", (short) this.minSpawnDelay);
+- nbt.putShort("MaxSpawnDelay", (short) this.maxSpawnDelay);
++ // Paper start
++ if (spawnDelay > Short.MAX_VALUE) {
++ nbt.putInt("Paper.Delay", this.spawnDelay);
++ }
++ nbt.putShort("Delay", (short) Math.min(Short.MAX_VALUE, this.spawnDelay));
++
++ if (minSpawnDelay > Short.MAX_VALUE || maxSpawnDelay > Short.MAX_VALUE) {
++ nbt.putInt("Paper.MinSpawnDelay", this.minSpawnDelay);
++ nbt.putInt("Paper.MaxSpawnDelay", this.maxSpawnDelay);
++ }
++
++ nbt.putShort("MinSpawnDelay", (short) Math.min(Short.MAX_VALUE, this.minSpawnDelay));
++ nbt.putShort("MaxSpawnDelay", (short) Math.min(Short.MAX_VALUE, this.maxSpawnDelay));
++ // Paper nbt
+ nbt.putShort("SpawnCount", (short) this.spawnCount);
+ nbt.putShort("MaxNearbyEntities", (short) this.maxNearbyEntities);
+ nbt.putShort("RequiredPlayerRange", (short) this.requiredPlayerRange);
+diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java b/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
+index 6c427b15f78970912bae881f5aba1cfae2a4ba53..0af969746b1984bd5de0510f815b54815c9322bf 100644
+--- a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
++++ b/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
+@@ -116,4 +116,28 @@ public class CraftCreatureSpawner extends CraftBlockEntityState<SpawnerBlockEnti
+ public void setSpawnRange(int spawnRange) {
+ this.getSnapshot().getSpawner().spawnRange = spawnRange;
+ }
++
++ // Paper start
++ @Override
++ public boolean isActivated() {
++ this.requirePlaced();
++ return this.getSnapshot().getSpawner().isNearPlayer(this.world.getHandle(), this.getPosition());
++ }
++
++ @Override
++ public void resetTimer() {
++ this.requirePlaced();
++ this.getSnapshot().getSpawner().delay(this.world.getHandle(), this.getPosition());
++ }
++
++ @Override
++ public void setSpawnedItem(org.bukkit.inventory.ItemStack itemStack) {
++ Preconditions.checkArgument(itemStack != null && !itemStack.getType().isAir(), "spawners cannot spawn air");
++ net.minecraft.world.item.ItemStack item = org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(itemStack);
++ net.minecraft.nbt.CompoundTag entity = new net.minecraft.nbt.CompoundTag();
++ entity.putString("id", net.minecraft.core.Registry.ENTITY_TYPE.getKey(net.minecraft.world.entity.EntityType.ITEM).toString());
++ entity.put("Item", item.save(new net.minecraft.nbt.CompoundTag()));
++ this.getSnapshot().getSpawner().setNextSpawnData(this.isPlaced() ? this.world.getHandle() : null, this.getPosition(), new net.minecraft.world.level.SpawnData(entity, java.util.Optional.empty()));
++ }
++ // Paper end
+ }