SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.13-pre7

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2018-07-15 10:00:00 +10:00
parent d1e91a8adb
commit 7e0a66fdd5
608 changed files with 17788 additions and 9378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
paper-server/nms-patches/SlotFurnaceResult.patch
View File

@@ -1,32 +1,32 @@
--- a/net/minecraft/server/SlotFurnaceResult.java
+++ b/net/minecraft/server/SlotFurnaceResult.java
@@ -1,5 +1,10 @@
package net.minecraft.server;
@@ -2,6 +2,10 @@
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 {
private final EntityHuman a;
@@ -51,6 +56,18 @@
i = j;
}
@@ -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());
+ // 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
+ 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;
while (i > 0) {
j = EntityExperienceOrb.getOrbValue(i);
i -= j;