Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SPIGOT-6637: Revert "#874: Add FurnaceStartSmeltEvent"

Browse Source 
This reverts commit 2ea359f1e4774d038626308888bee273f83b14f4.
This commit is contained in:
md_5 2021-07-11 12:26:27 +10:00
parent f4066854f9
commit a6292cc3c4
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
1 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
nms-patches/net/minecraft/world/level/block/entity/TileEntityFurnace.patch
View File

@ -1,6 +1,6 @@
--- a/net/minecraft/world/level/block/entity/TileEntityFurnace.java --- a/net/minecraft/world/level/block/entity/TileEntityFurnace.java
+++ b/net/minecraft/world/level/block/entity/TileEntityFurnace.java +++ b/net/minecraft/world/level/block/entity/TileEntityFurnace.java
@@ -43,6 +43,20 @@ @@ -43,6 +43,18 @@
import net.minecraft.world.level.block.state.IBlockData; import net.minecraft.world.level.block.state.IBlockData;
import net.minecraft.world.phys.Vec3D; import net.minecraft.world.phys.Vec3D;
@ -14,14 +14,12 @@
+import org.bukkit.event.inventory.FurnaceBurnEvent; +import org.bukkit.event.inventory.FurnaceBurnEvent;
+import org.bukkit.event.inventory.FurnaceExtractEvent; +import org.bukkit.event.inventory.FurnaceExtractEvent;
+import org.bukkit.event.inventory.FurnaceSmeltEvent; +import org.bukkit.event.inventory.FurnaceSmeltEvent;
+import org.bukkit.event.inventory.FurnaceStartSmeltEvent;
+import org.bukkit.inventory.FurnaceRecipe;
+// CraftBukkit end +// CraftBukkit end
+ +
public abstract class TileEntityFurnace extends TileEntityContainer implements IWorldInventory, RecipeHolder, AutoRecipeOutput { public abstract class TileEntityFurnace extends TileEntityContainer implements IWorldInventory, RecipeHolder, AutoRecipeOutput {
protected static final int SLOT_INPUT = 0; protected static final int SLOT_INPUT = 0;
@@ -182,6 +196,36 @@ @@ -182,6 +194,36 @@
return map; return map;
} }
@ -58,7 +56,7 @@
private static boolean b(Item item) { private static boolean b(Item item) {
return TagsItem.NON_FLAMMABLE_WOOD.isTagged(item); return TagsItem.NON_FLAMMABLE_WOOD.isTagged(item);
} }
@@ -266,13 +310,24 @@ @@ -266,13 +308,24 @@
tileentityfurnace.cookingProgress = MathHelper.clamp(tileentityfurnace.cookingProgress - 2, 0, tileentityfurnace.cookingTotalTime); tileentityfurnace.cookingProgress = MathHelper.clamp(tileentityfurnace.cookingProgress - 2, 0, tileentityfurnace.cookingTotalTime);
} }
} else { } else {
@ -86,23 +84,7 @@
flag1 = true; flag1 = true;
if (!itemstack.isEmpty()) { if (!itemstack.isEmpty()) {
Item item = itemstack.getItem(); Item item = itemstack.getItem();
@@ -288,11 +343,23 @@ @@ -292,7 +345,7 @@
}
if (tileentityfurnace.isBurning() && canBurn(irecipe, tileentityfurnace.items, i)) {
+ // CraftBukkit start
+ if (irecipe != null && tileentityfurnace.cookingProgress == 0) {
+ CraftItemStack source = CraftItemStack.asCraftMirror(tileentityfurnace.items.get(0));
+ FurnaceRecipe recipe = (FurnaceRecipe) irecipe.toBukkitRecipe();
+
+ FurnaceStartSmeltEvent event = new FurnaceStartSmeltEvent(CraftBlock.at(world, blockposition), source, recipe);
+ world.getCraftServer().getPluginManager().callEvent(event);
+
+ tileentityfurnace.cookingTotalTime = event.getTotalCookTime();
+ }
+ // CraftBukkit end
+
++tileentityfurnace.cookingProgress;
if (tileentityfurnace.cookingProgress == tileentityfurnace.cookingTotalTime) { if (tileentityfurnace.cookingProgress == tileentityfurnace.cookingTotalTime) {
tileentityfurnace.cookingProgress = 0; tileentityfurnace.cookingProgress = 0;
tileentityfurnace.cookingTotalTime = getRecipeCookingTime(world, tileentityfurnace.recipeType, tileentityfurnace); tileentityfurnace.cookingTotalTime = getRecipeCookingTime(world, tileentityfurnace.recipeType, tileentityfurnace);
@ -111,7 +93,7 @@
tileentityfurnace.setRecipeUsed(irecipe); tileentityfurnace.setRecipeUsed(irecipe);
} }
@@ -331,17 +398,44 @@ @@ -331,17 +384,44 @@
} }
} }
@ -157,7 +139,7 @@
if (itemstack.a(Blocks.WET_SPONGE.getItem()) && !((ItemStack) nonnulllist.get(1)).isEmpty() && ((ItemStack) nonnulllist.get(1)).a(Items.BUCKET)) { if (itemstack.a(Blocks.WET_SPONGE.getItem()) && !((ItemStack) nonnulllist.get(1)).isEmpty() && ((ItemStack) nonnulllist.get(1)).a(Items.BUCKET)) {
nonnulllist.set(1, new ItemStack(Items.WATER_BUCKET)); nonnulllist.set(1, new ItemStack(Items.WATER_BUCKET));
@@ -365,7 +459,7 @@ @@ -365,7 +445,7 @@
} }
private static int getRecipeCookingTime(World world, Recipes<? extends RecipeCooking> recipes, IInventory iinventory) { private static int getRecipeCookingTime(World world, Recipes<? extends RecipeCooking> recipes, IInventory iinventory) {
@ -166,7 +148,7 @@
} }
public static boolean isFuel(ItemStack itemstack) { public static boolean isFuel(ItemStack itemstack) {
@@ -484,14 +578,20 @@ @@ -484,14 +564,20 @@
@Override @Override
public void awardUsedRecipes(EntityHuman entityhuman) {} public void awardUsedRecipes(EntityHuman entityhuman) {}
@ -189,7 +171,7 @@
List<IRecipe<?>> list = Lists.newArrayList(); List<IRecipe<?>> list = Lists.newArrayList();
ObjectIterator objectiterator = this.recipesUsed.object2IntEntrySet().iterator(); ObjectIterator objectiterator = this.recipesUsed.object2IntEntrySet().iterator();
@@ -500,14 +600,14 @@ @@ -500,14 +586,14 @@
worldserver.getCraftingManager().getRecipe((MinecraftKey) entry.getKey()).ifPresent((irecipe) -> { worldserver.getCraftingManager().getRecipe((MinecraftKey) entry.getKey()).ifPresent((irecipe) -> {
list.add(irecipe); list.add(irecipe);
@ -206,7 +188,7 @@
int j = MathHelper.d((float) i * f); int j = MathHelper.d((float) i * f);
float f1 = MathHelper.h((float) i * f); float f1 = MathHelper.h((float) i * f);
@@ -515,6 +615,17 @@ @@ -515,6 +601,17 @@
++j; ++j;
} }