mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 12:27:59 +01:00
115 lines
3.8 KiB
Diff
115 lines
3.8 KiB
Diff
--- a/net/minecraft/server/TileEntityBrewingStand.java
|
|
+++ b/net/minecraft/server/TileEntityBrewingStand.java
|
|
@@ -3,6 +3,15 @@
|
|
import java.util.Arrays;
|
|
import java.util.Iterator;
|
|
|
|
+// CraftBukkit start
|
|
+import java.util.List;
|
|
+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
|
|
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
|
|
+import org.bukkit.entity.HumanEntity;
|
|
+import org.bukkit.event.inventory.BrewEvent;
|
|
+import org.bukkit.event.inventory.BrewingStandFuelEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public class TileEntityBrewingStand extends TileEntityContainer implements ITickable, IWorldInventory {
|
|
|
|
private static final int[] a = new int[] { 3};
|
|
@@ -14,6 +23,31 @@
|
|
private Item k;
|
|
private String l;
|
|
private int m;
|
|
+ // CraftBukkit start - add fields and methods
|
|
+ private int lastTick = MinecraftServer.currentTick;
|
|
+ public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
|
|
+ private int maxStack = 64;
|
|
+
|
|
+ public void onOpen(CraftHumanEntity who) {
|
|
+ transaction.add(who);
|
|
+ }
|
|
+
|
|
+ public void onClose(CraftHumanEntity who) {
|
|
+ transaction.remove(who);
|
|
+ }
|
|
+
|
|
+ public List<HumanEntity> getViewers() {
|
|
+ return transaction;
|
|
+ }
|
|
+
|
|
+ public List<ItemStack> getContents() {
|
|
+ return this.items;
|
|
+ }
|
|
+
|
|
+ public void setMaxStackSize(int size) {
|
|
+ maxStack = size;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
|
|
public TileEntityBrewingStand() {
|
|
this.items = NonNullList.a(5, ItemStack.a);
|
|
@@ -55,8 +89,19 @@
|
|
ItemStack itemstack = (ItemStack) this.items.get(4);
|
|
|
|
if (this.m <= 0 && itemstack.getItem() == Items.BLAZE_POWDER) {
|
|
- this.m = 20;
|
|
- itemstack.subtract(1);
|
|
+ // CraftBukkit start
|
|
+ BrewingStandFuelEvent event = new BrewingStandFuelEvent(world.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ()), CraftItemStack.asCraftMirror(itemstack), 20);
|
|
+ this.world.getServer().getPluginManager().callEvent(event);
|
|
+
|
|
+ if (event.isCancelled()) {
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ this.m = event.getFuelPower(); // PAIL fuelLevel
|
|
+ if (this.m > 0 && event.isConsuming()) {
|
|
+ itemstack.subtract(1);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
this.update();
|
|
}
|
|
|
|
@@ -64,9 +109,14 @@
|
|
boolean flag1 = this.brewTime > 0;
|
|
ItemStack itemstack1 = (ItemStack) this.items.get(3);
|
|
|
|
+ // CraftBukkit start - Use wall time instead of ticks for brewing
|
|
+ int elapsedTicks = MinecraftServer.currentTick - this.lastTick;
|
|
+ this.lastTick = MinecraftServer.currentTick;
|
|
+
|
|
if (flag1) {
|
|
- --this.brewTime;
|
|
- boolean flag2 = this.brewTime == 0;
|
|
+ this.brewTime -= elapsedTicks;
|
|
+ boolean flag2 = this.brewTime <= 0; // == -> <=
|
|
+ // CraftBukkit end
|
|
|
|
if (flag2 && flag) {
|
|
this.p();
|
|
@@ -140,6 +190,15 @@
|
|
|
|
private void p() {
|
|
ItemStack itemstack = (ItemStack) this.items.get(3);
|
|
+ // CraftBukkit start
|
|
+ if (getOwner() != null) {
|
|
+ BrewEvent event = new BrewEvent(world.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ()), (org.bukkit.inventory.BrewerInventory) this.getOwner().getInventory(), this.m);
|
|
+ org.bukkit.Bukkit.getPluginManager().callEvent(event);
|
|
+ if (event.isCancelled()) {
|
|
+ return;
|
|
+ }
|
|
+ }
|
|
+ // CraftBukkit end
|
|
|
|
for (int i = 0; i < 3; ++i) {
|
|
this.items.set(i, PotionBrewer.d(itemstack, (ItemStack) this.items.get(i)));
|
|
@@ -210,7 +269,7 @@
|
|
}
|
|
|
|
public int getMaxStackSize() {
|
|
- return 64;
|
|
+ return this.maxStack; // CraftBukkit
|
|
}
|
|
|
|
public boolean a(EntityHuman entityhuman) {
|