Paper/nms-patches/TileEntityFurnace.patch

181 lines
7.4 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/TileEntityFurnace.java
+++ b/net/minecraft/server/TileEntityFurnace.java
2016-05-10 13:47:39 +02:00
@@ -1,6 +1,15 @@
package net.minecraft.server;
2016-11-17 02:41:03 +01:00
import java.util.Iterator;
+// CraftBukkit start
+import java.util.List;
+
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.event.inventory.FurnaceBurnEvent;
+import org.bukkit.event.inventory.FurnaceSmeltEvent;
+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
+// CraftBukkit end
2016-05-10 13:47:39 +02:00
2016-02-29 22:32:46 +01:00
public class TileEntityFurnace extends TileEntityContainer implements ITickable, IWorldInventory {
2016-05-10 13:47:39 +02:00
@@ -14,6 +23,32 @@
private int cookTimeTotal;
private String m;
2015-02-26 23:41:06 +01:00
+ // CraftBukkit start - add fields and methods
+ private int lastTick = MinecraftServer.currentTick;
+ private int maxStack = MAX_STACK;
+ public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
+
2016-11-17 02:41:03 +01:00
+ public List<ItemStack> getContents() {
+ return this.items;
+ }
+
+ public void onOpen(CraftHumanEntity who) {
+ transaction.add(who);
+ }
+
+ public void onClose(CraftHumanEntity who) {
+ transaction.remove(who);
+ }
+
+ public List<HumanEntity> getViewers() {
+ return transaction;
+ }
+
+ public void setMaxStackSize(int size) {
+ maxStack = size;
+ }
+ // CraftBukkit end
2015-02-26 23:41:06 +01:00
+
2016-11-17 02:41:03 +01:00
public TileEntityFurnace() {
this.items = NonNullList.a(3, ItemStack.a);
}
@@ -119,11 +154,29 @@
}
2016-11-17 02:41:03 +01:00
public void F_() {
- boolean flag = this.isBurning();
2016-02-29 22:32:46 +01:00
+ boolean flag = (this.getBlock() == Blocks.LIT_FURNACE); // CraftBukkit - SPIGOT-844 - Check if furnace block is lit using the block instead of burn time
boolean flag1 = false;
2015-02-26 23:41:06 +01:00
+ // CraftBukkit start - Use wall time instead of ticks for cooking
+ int elapsedTicks = MinecraftServer.currentTick - this.lastTick;
+ this.lastTick = MinecraftServer.currentTick;
+
2016-11-17 02:41:03 +01:00
+ // CraftBukkit - moved from below - edited for wall time
+ if (this.isBurning() && this.canBurn()) {
+ this.cookTime += elapsedTicks;
+ if (this.cookTime >= this.cookTimeTotal) {
+ this.cookTime = 0;
2016-11-17 02:41:03 +01:00
+ this.cookTimeTotal = this.a((ItemStack) this.items.get(0));
+ this.burn();
+ flag1 = true;
+ }
+ } else {
+ this.cookTime = 0;
+ }
+ // CraftBukkit end
2015-02-26 23:41:06 +01:00
+
if (this.isBurning()) {
- --this.burnTime;
+ this.burnTime -= elapsedTicks; // CraftBukkit - use elapsedTicks in place of constant
}
2015-02-26 23:41:06 +01:00
if (!this.world.isClientSide) {
2016-11-17 02:41:03 +01:00
@@ -134,10 +187,21 @@
this.cookTime = MathHelper.clamp(this.cookTime - 2, 0, this.cookTimeTotal);
}
} else {
- if (!this.isBurning() && this.canBurn()) {
2016-11-17 02:41:03 +01:00
- this.burnTime = fuelTime(itemstack);
2016-06-09 03:43:49 +02:00
- this.ticksForCurrentFuel = this.burnTime;
- if (this.isBurning()) {
+ // CraftBukkit start - Handle multiple elapsed ticks
+ if (this.burnTime <= 0 && this.canBurn()) { // CraftBukkit - == to <=
2016-11-17 02:41:03 +01:00
+ CraftItemStack fuel = CraftItemStack.asCraftMirror(itemstack);
+
2016-11-17 02:41:03 +01:00
+ FurnaceBurnEvent furnaceBurnEvent = new FurnaceBurnEvent(this.world.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ()), fuel, fuelTime(itemstack));
+ this.world.getServer().getPluginManager().callEvent(furnaceBurnEvent);
+
+ if (furnaceBurnEvent.isCancelled()) {
+ return;
+ }
+
+ this.ticksForCurrentFuel = furnaceBurnEvent.getBurnTime();
+ this.burnTime += this.ticksForCurrentFuel;
+ if (this.burnTime > 0 && furnaceBurnEvent.isBurning()) {
+ // CraftBukkit end
flag1 = true;
2016-11-17 02:41:03 +01:00
if (!itemstack.isEmpty()) {
Item item = itemstack.getItem();
@@ -152,6 +216,7 @@
}
}
2015-02-26 23:41:06 +01:00
+ /* CraftBukkit start - Moved up
if (this.isBurning() && this.canBurn()) {
++this.cookTime;
if (this.cookTime == this.cookTimeTotal) {
2016-11-17 02:41:03 +01:00
@@ -163,11 +228,13 @@
} else {
this.cookTime = 0;
}
+ */
}
if (flag != this.isBurning()) {
flag1 = true;
BlockFurnace.a(this.isBurning(), this.world, this.position);
2016-02-29 22:32:46 +01:00
+ this.invalidateBlockCache(); // CraftBukkit - Invalidate tile entity's cached block type
}
}
2016-11-17 02:41:03 +01:00
@@ -192,7 +259,8 @@
} else {
ItemStack itemstack1 = (ItemStack) this.items.get(2);
2015-02-26 23:41:06 +01:00
2016-11-17 02:41:03 +01:00
- return itemstack1.isEmpty() ? true : (!itemstack1.doMaterialsMatch(itemstack) ? false : (itemstack1.getCount() < this.getMaxStackSize() && itemstack1.getCount() < itemstack1.getMaxStackSize() ? true : itemstack1.getCount() < itemstack.getMaxStackSize()));
+ // CraftBukkit - consider resultant count instead of current count
2016-11-19 11:14:46 +01:00
+ return itemstack1.isEmpty() ? true : (!itemstack1.doMaterialsMatch(itemstack) ? false : (itemstack1.getCount() + itemstack.getCount() <= this.getMaxStackSize() && itemstack1.getCount() + itemstack.getCount() < itemstack1.getMaxStackSize() ? true : itemstack1.getCount() + itemstack.getCount() <= itemstack.getMaxStackSize()));
2016-11-17 02:41:03 +01:00
}
}
}
2016-11-17 02:41:03 +01:00
@@ -203,11 +271,38 @@
ItemStack itemstack1 = RecipesFurnace.getInstance().getResult(itemstack);
ItemStack itemstack2 = (ItemStack) this.items.get(2);
2015-02-26 23:41:06 +01:00
+ // CraftBukkit start - fire FurnaceSmeltEvent
2016-11-17 02:41:03 +01:00
+ CraftItemStack source = CraftItemStack.asCraftMirror(itemstack);
+ org.bukkit.inventory.ItemStack result = CraftItemStack.asBukkitCopy(itemstack1);
2015-02-26 23:41:06 +01:00
+
+ FurnaceSmeltEvent furnaceSmeltEvent = new FurnaceSmeltEvent(this.world.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ()), source, result);
+ this.world.getServer().getPluginManager().callEvent(furnaceSmeltEvent);
+
+ if (furnaceSmeltEvent.isCancelled()) {
+ return;
+ }
+
+ result = furnaceSmeltEvent.getResult();
2016-11-17 02:41:03 +01:00
+ itemstack1 = CraftItemStack.asNMSCopy(result);
+
2016-11-17 02:41:03 +01:00
+ if (!itemstack1.isEmpty()) {
+ if (itemstack2.isEmpty()) {
+ this.items.set(2, itemstack1.cloneItemStack());
+ } else if (CraftItemStack.asCraftMirror(itemstack2).isSimilar(result)) {
+ itemstack2.add(itemstack1.getCount());
+ } else {
+ return;
+ }
+ }
2015-02-26 23:41:06 +01:00
+
+ /*
2016-11-17 02:41:03 +01:00
if (itemstack2.isEmpty()) {
this.items.set(2, itemstack1.cloneItemStack());
} else if (itemstack2.getItem() == itemstack1.getItem()) {
itemstack2.add(1);
}
+ */
+ // CraftBukkit end
2016-11-17 02:41:03 +01:00
if (itemstack.getItem() == Item.getItemOf(Blocks.SPONGE) && itemstack.getData() == 1 && !((ItemStack) this.items.get(1)).isEmpty() && ((ItemStack) this.items.get(1)).getItem() == Items.BUCKET) {
this.items.set(1, new ItemStack(Items.WATER_BUCKET));