diff --git a/paper-server/patches/sources/net/minecraft/world/level/BaseSpawner.java.patch b/paper-server/patches/sources/net/minecraft/world/level/BaseSpawner.java.patch index 6b80790cb6..222d1f7c65 100644 --- a/paper-server/patches/sources/net/minecraft/world/level/BaseSpawner.java.patch +++ b/paper-server/patches/sources/net/minecraft/world/level/BaseSpawner.java.patch @@ -100,3 +100,59 @@ } } +@@ -202,7 +237,13 @@ + } + + 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("SpawnData", 10); + + if (flag) { +@@ -225,9 +266,15 @@ + this.spawnPotentials = SimpleWeightedRandomList.single(this.nextSpawnData != null ? this.nextSpawnData : new SpawnData()); + } + ++ // Paper start - use ints if set ++ if (nbt.contains("Paper.MinSpawnDelay", net.minecraft.nbt.Tag.TAG_ANY_NUMERIC)) { ++ 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"); + } + +@@ -244,9 +291,20 @@ + } + + 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 end + nbt.putShort("SpawnCount", (short) this.spawnCount); + nbt.putShort("MaxNearbyEntities", (short) this.maxNearbyEntities); + nbt.putShort("RequiredPlayerRange", (short) this.requiredPlayerRange); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java index 9b2b6697d0..146dde2008 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java @@ -29,7 +29,7 @@ import org.bukkit.craftbukkit.entity.CraftEntityType; import org.bukkit.entity.EntitySnapshot; import org.bukkit.entity.EntityType; -public class CraftCreatureSpawner extends CraftBlockEntityState implements CreatureSpawner { +public class CraftCreatureSpawner extends CraftBlockEntityState implements CreatureSpawner, org.bukkit.craftbukkit.spawner.PaperSharedSpawnerLogic { // Paper - more spawner API public CraftCreatureSpawner(World world, SpawnerBlockEntity tileEntity) { super(world, tileEntity); @@ -291,4 +291,38 @@ public class CraftCreatureSpawner extends CraftBlockEntityState(nms.slotDropChances().entrySet().stream().collect(Collectors.toMap((entry) -> CraftEquipmentSlot.getSlot(entry.getKey()), Map.Entry::getValue))) )).orElse(null); } + + // Paper start - more spawner API + @Override + public boolean isActivated() { + requirePlaced(); + return org.bukkit.craftbukkit.spawner.PaperSharedSpawnerLogic.super.isActivated(); + } + + @Override + public void resetTimer() { + requirePlaced(); + org.bukkit.craftbukkit.spawner.PaperSharedSpawnerLogic.super.resetTimer(); + } + + @Override + public void setNextSpawnData(final SpawnData spawnData) { + this.getSpawner().setNextSpawnData(this.isPlaced() ? this.getInternalWorld() : null, this.getInternalPosition(), spawnData); + } + + @Override + public BaseSpawner getSpawner() { + return this.getSnapshot().getSpawner(); + } + + @Override + public net.minecraft.core.BlockPos getInternalPosition() { + return this.getPosition(); + } + + @Override + public net.minecraft.world.level.Level getInternalWorld() { + return this.world.getHandle(); + } + // Paper end - more spawner API } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartMobSpawner.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartMobSpawner.java index 72e34dbfad..e8ece01669 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartMobSpawner.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartMobSpawner.java @@ -16,7 +16,7 @@ import org.bukkit.entity.EntitySnapshot; import org.bukkit.entity.EntityType; import org.bukkit.entity.minecart.SpawnerMinecart; -final class CraftMinecartMobSpawner extends CraftMinecart implements SpawnerMinecart { +final class CraftMinecartMobSpawner extends CraftMinecart implements SpawnerMinecart, org.bukkit.craftbukkit.spawner.PaperSharedSpawnerLogic { // Paper - more spawner API CraftMinecartMobSpawner(CraftServer server, MinecartSpawner entity) { super(server, entity); } @@ -171,4 +171,21 @@ final class CraftMinecartMobSpawner extends CraftMinecart implements SpawnerMine public String toString() { return "CraftMinecartMobSpawner"; } + + // Paper start - more spawner API + @Override + public net.minecraft.world.level.BaseSpawner getSpawner() { + return this.getHandle().getSpawner(); + } + + @Override + public net.minecraft.world.level.Level getInternalWorld() { + return this.getHandle().level(); + } + + @Override + public net.minecraft.core.BlockPos getInternalPosition() { + return this.getHandle().blockPosition(); + } + // Paper end - more spawner API } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/spawner/PaperSharedSpawnerLogic.java b/paper-server/src/main/java/org/bukkit/craftbukkit/spawner/PaperSharedSpawnerLogic.java new file mode 100644 index 0000000000..b1d08dc4c4 --- /dev/null +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/spawner/PaperSharedSpawnerLogic.java @@ -0,0 +1,56 @@ +package org.bukkit.craftbukkit.spawner; + +import com.google.common.base.Preconditions; +import java.util.Optional; +import net.minecraft.core.BlockPos; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.level.BaseSpawner; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.SpawnData; +import org.bukkit.craftbukkit.inventory.CraftItemStack; +import org.bukkit.inventory.ItemStack; +import org.bukkit.spawner.Spawner; + +/** + * A common parent interface for both the {@link org.bukkit.craftbukkit.block.CraftCreatureSpawner} and minecart mob spawner. + */ +public interface PaperSharedSpawnerLogic extends Spawner { + + BaseSpawner getSpawner(); + + Level getInternalWorld(); + + BlockPos getInternalPosition(); + + default boolean isActivated() { + return this.getSpawner().isNearPlayer(this.getInternalWorld(), this.getInternalPosition()); + } + + default void resetTimer() { + this.getSpawner().delay(this.getInternalWorld(), this.getInternalPosition()); + } + + default void setNextSpawnData(SpawnData spawnData) { + this.getSpawner().setNextSpawnData(this.getInternalWorld(), this.getInternalPosition(), spawnData); + } + + default void setSpawnedItem(final ItemStack itemStack) { + Preconditions.checkArgument(itemStack != null && !itemStack.getType().isAir(), "spawners cannot spawn air"); + + final net.minecraft.world.item.ItemStack item = CraftItemStack.asNMSCopy(itemStack); + final CompoundTag entity = new CompoundTag(); + entity.putString(Entity.ID_TAG, BuiltInRegistries.ENTITY_TYPE.getKey(EntityType.ITEM).toString()); + entity.put("Item", item.save(this.getInternalWorld().registryAccess())); + + this.setNextSpawnData( + new net.minecraft.world.level.SpawnData( + entity, + java.util.Optional.empty(), + Optional.ofNullable(this.getSpawner().nextSpawnData).flatMap(SpawnData::equipment) + ) + ); + } +}