Update to Minecraft 1.14-pre5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-04-23 12:00:00 +10:00
parent 0e98365784
commit a0f2b74c8d
560 changed files with 10642 additions and 10867 deletions

View File

@@ -1,32 +1,11 @@
--- a/net/minecraft/server/SlotFurnaceResult.java
+++ b/net/minecraft/server/SlotFurnaceResult.java
@@ -2,6 +2,10 @@
@@ -41,7 +41,7 @@
protected void c(ItemStack itemstack) {
itemstack.a(this.a.world, this.a, this.b);
if (!this.a.world.isClientSide && this.inventory instanceof TileEntityFurnace) {
- ((TileEntityFurnace) this.inventory).d(this.a);
+ ((TileEntityFurnace) this.inventory).d(this.a, itemstack, this.b); // CraftBukkit
}
import java.util.Iterator;
import java.util.Map.Entry;
+// CraftBukkit start
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.FurnaceExtractEvent;
+// CraftBukkit end
public class SlotFurnaceResult extends Slot {
@@ -66,6 +70,18 @@
i = j;
}
+ // CraftBukkit start - fire FurnaceExtractEvent
+ Player player = (Player) a.getBukkitEntity();
+ TileEntityFurnace furnace = ((TileEntityFurnace) this.inventory);
+ org.bukkit.block.Block block = a.world.getWorld().getBlockAt(furnace.position.getX(), furnace.position.getY(), furnace.position.getZ());
+
+ if (b != 0) {
+ FurnaceExtractEvent event = new FurnaceExtractEvent(player, block, org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(itemstack.getItem()), b, i);
+ a.world.getServer().getPluginManager().callEvent(event);
+ i = event.getExpToDrop();
+ }
+ // CraftBukkit end
+
while (i > 0) {
j = EntityExperienceOrb.getOrbValue(i);
i -= j;
this.b = 0;