mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 23:38:25 +01:00
Add consumeFuel to FurnaceBurnEvent (#5532)
This commit is contained in:
parent
b1d73c6a4c
commit
3db3f8e72d
2 changed files with 63 additions and 0 deletions
44
Spigot-API-Patches/add-consumeFuel-to-FurnaceBurnEvent.patch
Normal file
44
Spigot-API-Patches/add-consumeFuel-to-FurnaceBurnEvent.patch
Normal file
|
@ -0,0 +1,44 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||||
Date: Thu, 22 Apr 2021 16:45:15 -0700
|
||||
Subject: [PATCH] add consumeFuel to FurnaceBurnEvent
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java b/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java
|
||||
+++ b/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java
|
||||
@@ -0,0 +0,0 @@ public class FurnaceBurnEvent extends BlockEvent implements Cancellable {
|
||||
private int burnTime;
|
||||
private boolean cancelled;
|
||||
private boolean burning;
|
||||
+ private boolean consumeFuel = true; // Paper
|
||||
|
||||
public FurnaceBurnEvent(@NotNull final Block furnace, @NotNull final ItemStack fuel, final int burnTime) {
|
||||
super(furnace);
|
||||
@@ -0,0 +0,0 @@ public class FurnaceBurnEvent extends BlockEvent implements Cancellable {
|
||||
public void setBurning(boolean burning) {
|
||||
this.burning = burning;
|
||||
}
|
||||
+ // Paper start
|
||||
+ /**
|
||||
+ * Gets whether the furnace's fuel will be consumed or not.
|
||||
+ *
|
||||
+ * @return whether the furnace's fuel will be consumed
|
||||
+ */
|
||||
+ public boolean willConsumeFuel() {
|
||||
+ return consumeFuel;
|
||||
+ }
|
||||
+
|
||||
+ /**
|
||||
+ * Sets whether the furnace's fuel will be consumed or not.
|
||||
+ *
|
||||
+ * @param consumeFuel true to consume the fuel
|
||||
+ */
|
||||
+ public void setConsumeFuel(boolean consumeFuel) {
|
||||
+ this.consumeFuel = consumeFuel;
|
||||
+ }
|
||||
+ // Paper end
|
||||
|
||||
@Override
|
||||
public boolean isCancelled() {
|
|
@ -0,0 +1,19 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||||
Date: Thu, 22 Apr 2021 16:45:28 -0700
|
||||
Subject: [PATCH] add consumeFuel to FurnaceBurnEvent
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/level/block/entity/TileEntityFurnace.java b/src/main/java/net/minecraft/world/level/block/entity/TileEntityFurnace.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/net/minecraft/world/level/block/entity/TileEntityFurnace.java
|
||||
+++ b/src/main/java/net/minecraft/world/level/block/entity/TileEntityFurnace.java
|
||||
@@ -0,0 +0,0 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
|
||||
if (this.isBurning() && furnaceBurnEvent.isBurning()) {
|
||||
// CraftBukkit end
|
||||
flag1 = true;
|
||||
- if (!itemstack.isEmpty()) {
|
||||
+ if (!itemstack.isEmpty() && furnaceBurnEvent.willConsumeFuel()) { // Paper
|
||||
Item item = itemstack.getItem();
|
||||
|
||||
itemstack.subtract(1);
|
Loading…
Reference in a new issue