Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 02:50:09 +01:00
4d20922b79
* Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: e86f4dc4 PR-1041: Improve getPlayer(String) docs to clarify it matches the name 9738f005 Fix spawner API documentation 69ebd9fd PR-1034: Add TrialSpawnerSpawnEvent 23cffd9c PR-973: Improve spawner API and add API for Trial Spawners 8bf19163 PR-1038: Clarify HumanEntity#openInventory(InventoryView) JavaDoc 1ff76351 SPIGOT-7732, SPIGOT-7786: Add freezing damage modifier 02161cb4 PR-1034: Add CreatureSpawnEvent.SpawnReason#TRIAL_SPAWNER f9cb6f34 SPIGOT-7777: All entity potion effects are removed on death 25d548eb PR-1031: Expose Creeper igniter ccbf0915 SPIGOT-7770: Reserve spaces in shaped recipes for blank ingredients 17f7097c Clarify ambiguity around what is API 71714f0c Remove note from InventoryView JavaDoc aaf49731 PR-1030: Deprecate more unused methods in UnsafeValues 3a9dc689 SPIGOT-7771: Material.getDefaultAttributes always returns an empty map CraftBukkit Changes: c3ceeb6f7 SPIGOT-7814: Call PlayerShearEntityEvent for Bogged 97b1e4f58 Fix wolf armor not dropping from use of shears fd2ef563a SPIGOT-7812: Revert "SPIGOT-7809: Restore shield/banner conversion for base colours" f672c351b SPIGOT-7811: Enchantments are applied on sweeping attack even if damage event is cancelled cfe29350b SPIGOT-7808: Fix implementation of Enchantment#getName() for bad name return 19335f69e SPIGOT-7809: Restore shield/banner conversion for base colours ae4f5a0be SPIGOT-7805: Fix jukebox deserialization 62e3b73a4 SPIGOT-7804: Fix written book serialization aac911d26 SPIGOT-7800, SPIGOT-7801: Keep vanilla behaviour for items dropped on player death 13ece474f PR-1429: Implement TrialSpawnerSpawnEvent bf13e9113 PR-1354: Improve spawner API and add API for Trial Spawners 515fe49e1 Increase outdated build delay 9cd5a19a0 SPIGOT-7794: Cancelling InventoryItemMoveEvent destroys items ce40c7b14 SPIGOT-7796: Kickplayer newlines not working 5167256ff SPIGOT-7795: Fix damage/stats ignore the invulnerable damage time f993563ee Improve cross-world teleportation handling ab29122cf PR-1433: HumanEntity#openInventory(InventoryView) should only support views belonging to the player 764a541c5 SPIGOT-7732: Issue with the "hurt()" method of EntityLiving and invulnerable time 820084b5f SPIGOT-7791: Skull BlockState with null profile causes NullPointerException 5e46f1c82 SPIGOT-7785: Teleporting a player at the right moment can mess up vanilla teleportation cbd95a6b3 SPIGOT-7772: Include hidden / non-sampled players in player count 3153debc5 SPIGOT-7790: Server crashes after bee nest is forced to update e77bb26bb SPIGOT-7788: The healing power of friendship advancement is never granted ee3d7258a SPIGOT-7789: Fix NPE in CraftMetaFirework applyToItem 2889b3a11 PR-1429: Add CreatureSpawnEvent.SpawnReason#TRIAL_SPAWNER cdd05bc7f SPIGOT-7777: Speed attribute stays after death; missing EntityPotionEffectEvent call d0e6af2d4 PR-1428: Expose Creeper igniter d01c70e93 PR-1425: Fix bytecode transformation taking care of class-to-interface compatibility. b2b08f68c SPIGOT-7770: Fix certain shaped recipes not registering 3f8e4161f PR-1426: Deprecate more unused methods in UnsafeValues 2c9dd879e SPIGOT-7771: Material.getDefaultAttributes always returns an empty map Spigot Changes: 491f3675 Rebuild patches 0a642bd7 Rebuild patches 8897571b Rebuild patches cb8cf80c Fix newlines in custom restart message 1aabe506 Rebuild patches
220 Zeilen
9.9 KiB
Diff
220 Zeilen
9.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Fri, 19 Apr 2019 12:41:13 -0500
|
|
Subject: [PATCH] Mob Spawner API Enhancements
|
|
|
|
== AT ==
|
|
public net.minecraft.world.level.BaseSpawner isNearPlayer(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)Z
|
|
public net.minecraft.world.level.BaseSpawner delay(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)V
|
|
public net.minecraft.world.level.BaseSpawner setNextSpawnData(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/SpawnData;)V
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
|
|
index 1d0964a7f544735a0213d5c7832c71f53db139a9..b90127f9f805fdb5bb43a4b8ad2b10499b0b6b78 100644
|
|
--- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
|
|
+++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
|
|
@@ -237,7 +237,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("SpawnData", 10);
|
|
|
|
if (flag) {
|
|
@@ -260,9 +266,15 @@ public abstract class BaseSpawner {
|
|
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");
|
|
}
|
|
|
|
@@ -279,9 +291,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 end
|
|
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 9b2b6697d0b64da2bc99dc646f552c2689d5a1fc..146dde200845abcbe11015dda2c826a1aa711e42 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
|
|
+++ b/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<SpawnerBlockEntity> implements CreatureSpawner {
|
|
+public class CraftCreatureSpawner extends CraftBlockEntityState<SpawnerBlockEntity> 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<SpawnerBlockEnti
|
|
new HashMap<>(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/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartMobSpawner.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartMobSpawner.java
|
|
index 72e34dbfadcebb26a0707ce095b0d270f4d1d97c..e8ece01669373ecf6552d33b2ed72668524e2650 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartMobSpawner.java
|
|
+++ b/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/src/main/java/org/bukkit/craftbukkit/spawner/PaperSharedSpawnerLogic.java b/src/main/java/org/bukkit/craftbukkit/spawner/PaperSharedSpawnerLogic.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..b1d08dc4c4257a6f5cd70dfdddade58ff7eedb4b
|
|
--- /dev/null
|
|
+++ b/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)
|
|
+ )
|
|
+ );
|
|
+ }
|
|
+}
|