mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-05 09:57:37 +02:00
d627cfa110
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes:17da3420Fix reading custom persistent entity data83783357SPIGOT-4980: Shields will not be put on cooldown when hit with an axe8d0f3722SPIGOT-4752: Fixed inconsistency between isChunkLoaded and chunk load/unload events3f9f31c3SPIGOT-4982: Armor disappearing while breaking the armor stand
28 lines
1.4 KiB
Diff
28 lines
1.4 KiB
Diff
From b03c5a441be0f76f6457a3893f45a669a1d00c9c Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Mon, 4 Jun 2018 20:39:20 -0400
|
|
Subject: [PATCH] Allow spawning Item entities with World.spawnEntity
|
|
|
|
This API has more capabilities than .dropItem with the Consumer function
|
|
|
|
Item can be set inside of the Consumer pre spawn function.
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
index 8ed22217da..8fa9346cfe 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
@@ -1304,6 +1304,10 @@ public class CraftWorld implements World {
|
|
if (Boat.class.isAssignableFrom(clazz)) {
|
|
entity = new EntityBoat(world, x, y, z);
|
|
entity.setPositionRotation(x, y, z, yaw, pitch);
|
|
+ // Paper start
|
|
+ } else if (org.bukkit.entity.Item.class.isAssignableFrom(clazz)) {
|
|
+ entity = new EntityItem(world, x, y, z, new net.minecraft.server.ItemStack(net.minecraft.server.Item.getItemOf(net.minecraft.server.Blocks.DIRT)));
|
|
+ // Paper end
|
|
} else if (FallingBlock.class.isAssignableFrom(clazz)) {
|
|
entity = new EntityFallingBlock(world, x, y, z, world.getType(new BlockPosition(x, y, z)));
|
|
} else if (Projectile.class.isAssignableFrom(clazz)) {
|
|
--
|
|
2.21.0
|
|
|