mirror of
https://github.com/barkeser2002/CatServer.git
synced 2026-09-25 09:26:08 +03:00
60 lines
2.5 KiB
Diff
60 lines
2.5 KiB
Diff
--- a/net/minecraft/world/level/block/entity/TileEntityBrewingStand.java
|
|
+++ b/net/minecraft/world/level/block/entity/TileEntityBrewingStand.java
|
|
@@ -25,6 +25,19 @@
|
|
import net.minecraft.world.level.block.BlockBrewingStand;
|
|
import net.minecraft.world.level.block.state.IBlockData;
|
|
|
|
+// CraftBukkit start
|
|
+import java.util.ArrayList;
|
|
+import java.util.List;
|
|
+import net.minecraft.server.MinecraftServer;
|
|
+import org.bukkit.craftbukkit.block.CraftBlock;
|
|
+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;
|
|
+import org.bukkit.inventory.InventoryHolder;
|
|
+// CraftBukkit end
|
|
+
|
|
public class TileEntityBrewingStand extends TileEntityContainer implements IWorldInventory {
|
|
|
|
private static final int INGREDIENT_SLOT = 3;
|
|
@@ -42,6 +55,36 @@
|
|
private Item ingredient;
|
|
public int fuel;
|
|
protected final IContainerProperties dataAccess;
|
|
|
|
public TileEntityBrewingStand(BlockPosition blockposition, IBlockData iblockdata) {
|
|
super(TileEntityTypes.BREWING_STAND, blockposition, iblockdata);
|
|
@@ -109,8 +152,19 @@
|
|
ItemStack itemstack = (ItemStack) tileentitybrewingstand.items.get(4);
|
|
|
|
if (tileentitybrewingstand.fuel <= 0 && itemstack.is(Items.BLAZE_POWDER)) {
|
|
setChanged(world, blockposition, iblockdata);
|
|
}
|
|
setChanged(world, blockposition, iblockdata);
|
|
} else if (!flag || !itemstack1.is(tileentitybrewingstand.ingredient)) {
|
|
tileentitybrewingstand.brewTime = 0;
|
|
@@ -187,11 +246,33 @@
|
|
}
|
|
}
|
|
|
|
- private static void doBrew(World world, BlockPosition blockposition, NonNullList<ItemStack> nonnulllist) {
|
|
+ // CraftBukkit start
|
|
+ private static void doBrew(World world, BlockPosition blockposition, NonNullList<ItemStack> nonnulllist, TileEntityBrewingStand tileentitybrewingstand) {
|
|
ItemStack itemstack = (ItemStack) nonnulllist.get(3);
|
|
|
|
for (int i = 0; i < 3; ++i) {
|
|
- nonnulllist.set(i, PotionBrewer.mix(itemstack, (ItemStack) nonnulllist.get(i)));
|
|
+ // CraftBukkit start - validate index in case it is cleared by plugins
|
|
+ if (i < brewResults.size()) {
|
|
+ nonnulllist.set(i, CraftItemStack.asNMSCopy(brewResults.get(i)));
|
|
+ } else {
|
|
+ nonnulllist.set(i, ItemStack.EMPTY);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
itemstack.shrink(1);
|