diff options
Diffstat (limited to 'Spigot-Server-Patches/0377-Mob-Spawner-API-Enhancements.patch')
-rw-r--r-- | Spigot-Server-Patches/0377-Mob-Spawner-API-Enhancements.patch | 107 |
1 files changed, 107 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0377-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0377-Mob-Spawner-API-Enhancements.patch new file mode 100644 index 0000000000..978d94299b --- /dev/null +++ b/Spigot-Server-Patches/0377-Mob-Spawner-API-Enhancements.patch @@ -0,0 +1,107 @@ +From e44fa7d596b9d2d5a3f39a0d377d0f9606248d9c 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/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +index 079099e30..b05f6c2f2 100644 +--- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java ++++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +@@ -46,6 +46,7 @@ public abstract class MobSpawnerAbstract { + this.mobs.clear(); // CraftBukkit - SPIGOT-3496, MC-92282 + } + ++ public boolean isActivated() { return h(); } // Paper - OBFHELPER + private boolean h() { + BlockPosition blockposition = this.b(); + +@@ -206,6 +207,7 @@ public abstract class MobSpawnerAbstract { + } + } + ++ public void resetTimer() { i(); } // Paper - OBFHELPER + private void i() { + if (this.maxSpawnDelay <= this.minSpawnDelay) { + this.spawnDelay = this.minSpawnDelay; +@@ -223,7 +225,13 @@ public abstract class MobSpawnerAbstract { + } + + public void a(NBTTagCompound nbttagcompound) { ++ // Paper start - use larger int if set ++ if (nbttagcompound.hasKey("Paper.Delay")) { ++ this.spawnDelay = nbttagcompound.getInt("Paper.Delay"); ++ } else { + this.spawnDelay = nbttagcompound.getShort("Delay"); ++ } ++ // Paper end + this.mobs.clear(); + if (nbttagcompound.hasKeyOfType("SpawnPotentials", 9)) { + NBTTagList nbttaglist = nbttagcompound.getList("SpawnPotentials", 10); +@@ -238,10 +246,15 @@ public abstract class MobSpawnerAbstract { + } else if (!this.mobs.isEmpty()) { + this.setSpawnData((MobSpawnerData) WeightedRandom.a(this.a().random, this.mobs)); + } +- ++ // Paper start - use ints if set ++ if (nbttagcompound.hasKeyOfType("Paper.MinSpawnDelay", 99)) { ++ this.minSpawnDelay = nbttagcompound.getInt("Paper.MinSpawnDelay"); ++ this.maxSpawnDelay = nbttagcompound.getInt("Paper.MaxSpawnDelay"); ++ this.spawnCount = nbttagcompound.getShort("SpawnCount"); ++ } else // Paper end + if (nbttagcompound.hasKeyOfType("MinSpawnDelay", 99)) { +- this.minSpawnDelay = nbttagcompound.getShort("MinSpawnDelay"); +- this.maxSpawnDelay = nbttagcompound.getShort("MaxSpawnDelay"); ++ this.minSpawnDelay = nbttagcompound.getInt("MinSpawnDelay"); ++ this.maxSpawnDelay = nbttagcompound.getInt("MaxSpawnDelay"); + this.spawnCount = nbttagcompound.getShort("SpawnCount"); + } + +@@ -266,9 +279,20 @@ public abstract class MobSpawnerAbstract { + if (minecraftkey == null) { + return nbttagcompound; + } else { +- nbttagcompound.setShort("Delay", (short) this.spawnDelay); +- nbttagcompound.setShort("MinSpawnDelay", (short) this.minSpawnDelay); +- nbttagcompound.setShort("MaxSpawnDelay", (short) this.maxSpawnDelay); ++ // Paper start ++ if (spawnDelay > Short.MAX_VALUE) { ++ nbttagcompound.setInt("Paper.Delay", this.spawnDelay); ++ } ++ nbttagcompound.setShort("Delay", (short) Math.min(Short.MAX_VALUE, this.spawnDelay)); ++ ++ if (minSpawnDelay > Short.MAX_VALUE || maxSpawnDelay > Short.MAX_VALUE) { ++ nbttagcompound.setInt("Paper.MinSpawnDelay", this.minSpawnDelay); ++ nbttagcompound.setInt("Paper.MaxSpawnDelay", this.maxSpawnDelay); ++ } ++ ++ nbttagcompound.setShort("MinSpawnDelay", (short) Math.min(Short.MAX_VALUE, this.minSpawnDelay)); ++ nbttagcompound.setShort("MaxSpawnDelay", (short) Math.min(Short.MAX_VALUE, this.maxSpawnDelay)); ++ // Paper end + nbttagcompound.setShort("SpawnCount", (short) this.spawnCount); + nbttagcompound.setShort("MaxNearbyEntities", (short) this.maxNearbyEntities); + nbttagcompound.setShort("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 5c4c3c70c..e78e3804b 100644 +--- a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java ++++ b/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java +@@ -121,4 +121,16 @@ public class CraftCreatureSpawner extends CraftBlockEntityState<TileEntityMobSpa + public void setSpawnRange(int spawnRange) { + this.getSnapshot().getSpawner().spawnRange = spawnRange; + } ++ ++ // Paper start ++ @Override ++ public boolean isActivated() { ++ return this.getSnapshot().getSpawner().isActivated(); ++ } ++ ++ @Override ++ public void resetTimer() { ++ this.getSnapshot().getSpawner().resetTimer(); ++ } ++ // Paper end + } +-- +2.23.0 + |