Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-27 04:55:47 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-2695: Added BrewingStandFuelEvent and added fuel level to the BrewEvent

Browse Source
This commit is contained in:
LukBukkit 2016-11-24 18:03:48 +01:00 committed by md_5
parent 6e887cd942
commit 27d625184d
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
nms-patches/TileEntityBrewingStand.patch
View File

@ -1,20 +1,22 @@
--- a/net/minecraft/server/TileEntityBrewingStand.java --- a/net/minecraft/server/TileEntityBrewingStand.java
+++ b/net/minecraft/server/TileEntityBrewingStand.java +++ b/net/minecraft/server/TileEntityBrewingStand.java
@@ -3,6 +3,13 @@ @@ -3,6 +3,15 @@
import java.util.Arrays; import java.util.Arrays;
import java.util.Iterator; import java.util.Iterator;
+// CraftBukkit start +// CraftBukkit start
+import java.util.List; +import java.util.List;
+import org.bukkit.craftbukkit.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.entity.HumanEntity; +import org.bukkit.entity.HumanEntity;
+import org.bukkit.event.inventory.BrewEvent; +import org.bukkit.event.inventory.BrewEvent;
+import org.bukkit.event.inventory.BrewingStandFuelEvent;
+// CraftBukkit end +// CraftBukkit end
+ +
public class TileEntityBrewingStand extends TileEntityContainer implements ITickable, IWorldInventory { public class TileEntityBrewingStand extends TileEntityContainer implements ITickable, IWorldInventory {
private static final int[] a = new int[] { 3}; private static final int[] a = new int[] { 3};
@@ -14,6 +21,31 @@ @@ -14,6 +23,31 @@
private Item k; private Item k;
private String l; private String l;
private int m; private int m;
@ -46,7 +48,29 @@
public TileEntityBrewingStand() { public TileEntityBrewingStand() {
this.items = NonNullList.a(5, ItemStack.a); this.items = NonNullList.a(5, ItemStack.a);
@@ -64,9 +96,14 @@ @@ -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; boolean flag1 = this.brewTime > 0;
ItemStack itemstack1 = (ItemStack) this.items.get(3); ItemStack itemstack1 = (ItemStack) this.items.get(3);
@ -63,13 +87,13 @@
if (flag2 && flag) { if (flag2 && flag) {
this.p(); this.p();
@@ -140,6 +177,15 @@ @@ -140,6 +190,15 @@
private void p() { private void p() {
ItemStack itemstack = (ItemStack) this.items.get(3); ItemStack itemstack = (ItemStack) this.items.get(3);
+ // CraftBukkit start + // CraftBukkit start
+ if (getOwner() != null) { + if (getOwner() != null) {
+ BrewEvent event = new BrewEvent(world.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ()), (org.bukkit.inventory.BrewerInventory) this.getOwner().getInventory()); + 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); + org.bukkit.Bukkit.getPluginManager().callEvent(event);
+ if (event.isCancelled()) { + if (event.isCancelled()) {
+ return; + return;
@ -79,7 +103,7 @@
for (int i = 0; i < 3; ++i) { for (int i = 0; i < 3; ++i) {
this.items.set(i, PotionBrewer.d(itemstack, (ItemStack) this.items.get(i))); this.items.set(i, PotionBrewer.d(itemstack, (ItemStack) this.items.get(i)));
@@ -210,7 +256,7 @@ @@ -210,7 +269,7 @@
} }
public int getMaxStackSize() { public int getMaxStackSize() {