3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-30 01:50:08 +01:00
Paper/nms-patches/TileEntityFurnace.patch

187 Zeilen
7.5 KiB
Diff

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/TileEntityFurnace.java
+++ b/net/minecraft/server/TileEntityFurnace.java
2020-06-25 02:00:00 +02:00
@@ -9,6 +9,16 @@
import java.util.List;
2018-07-15 02:00:00 +02:00
import java.util.Map;
import javax.annotation.Nullable;
+// CraftBukkit start
+import org.bukkit.craftbukkit.block.CraftBlock;
+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.entity.HumanEntity;
2019-04-23 04:00:00 +02:00
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.FurnaceBurnEvent;
2019-04-23 04:00:00 +02:00
+import org.bukkit.event.inventory.FurnaceExtractEvent;
+import org.bukkit.event.inventory.FurnaceSmeltEvent;
+// CraftBukkit end
2016-05-10 13:47:39 +02:00
2019-04-23 04:00:00 +02:00
public abstract class TileEntityFurnace extends TileEntityContainer implements IWorldInventory, RecipeHolder, AutoRecipeOutput, ITickable {
2020-06-25 02:00:00 +02:00
@@ -137,6 +147,36 @@
2018-12-25 22:00:00 +01:00
return map;
2018-07-15 02:00:00 +02:00
}
2015-02-26 23:41:06 +01:00
+ // CraftBukkit start - add fields and methods
+ private int maxStack = MAX_STACK;
+ public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
+
2016-11-17 02:41:03 +01:00
+ public List<ItemStack> getContents() {
+ return this.items;
+ }
+
+ public void onOpen(CraftHumanEntity who) {
+ transaction.add(who);
+ }
+
+ public void onClose(CraftHumanEntity who) {
+ transaction.remove(who);
+ }
+
+ public List<HumanEntity> getViewers() {
+ return transaction;
+ }
+
2019-04-23 04:00:00 +02:00
+ @Override
+ public int getMaxStackSize() {
+ return maxStack;
+ }
+
+ public void setMaxStackSize(int size) {
+ maxStack = size;
+ }
+ // CraftBukkit end
2015-02-26 23:41:06 +01:00
+
2020-06-25 02:00:00 +02:00
private static boolean b(Item item) {
return TagsItem.NON_FLAMMABLE_WOOD.isTagged(item);
}
@@ -223,12 +263,23 @@
2019-04-23 04:00:00 +02:00
this.cookTime = MathHelper.clamp(this.cookTime - 2, 0, this.cookTimeTotal);
}
} else {
- IRecipe<?> irecipe = (IRecipe) this.world.getCraftingManager().craft(this.c, this, this.world).orElse((Object) null);
+ IRecipe irecipe = this.world.getCraftingManager().craft((Recipes<RecipeCooking>) this.c, this, this.world).orElse(null); // Eclipse fail
if (!this.isBurning() && this.canBurn(irecipe)) {
2019-04-23 04:00:00 +02:00
- this.burnTime = this.fuelTime(itemstack);
+ // CraftBukkit start
2016-11-17 02:41:03 +01:00
+ CraftItemStack fuel = CraftItemStack.asCraftMirror(itemstack);
+
+ FurnaceBurnEvent furnaceBurnEvent = new FurnaceBurnEvent(CraftBlock.at(this.world, this.position), fuel, fuelTime(itemstack));
+ this.world.getServer().getPluginManager().callEvent(furnaceBurnEvent);
+
+ if (furnaceBurnEvent.isCancelled()) {
+ return;
+ }
+
+ this.burnTime = furnaceBurnEvent.getBurnTime();
this.ticksForCurrentFuel = this.burnTime;
- if (this.isBurning()) {
+ if (this.isBurning() && furnaceBurnEvent.isBurning()) {
+ // CraftBukkit end
flag1 = true;
2016-11-17 02:41:03 +01:00
if (!itemstack.isEmpty()) {
Item item = itemstack.getItem();
2020-06-25 02:00:00 +02:00
@@ -290,11 +341,38 @@
2019-12-10 23:00:00 +01:00
ItemStack itemstack1 = irecipe.getResult();
2016-11-17 02:41:03 +01:00
ItemStack itemstack2 = (ItemStack) this.items.get(2);
2015-02-26 23:41:06 +01:00
+ // CraftBukkit start - fire FurnaceSmeltEvent
2016-11-17 02:41:03 +01:00
+ CraftItemStack source = CraftItemStack.asCraftMirror(itemstack);
+ org.bukkit.inventory.ItemStack result = CraftItemStack.asBukkitCopy(itemstack1);
2015-02-26 23:41:06 +01:00
+
+ FurnaceSmeltEvent furnaceSmeltEvent = new FurnaceSmeltEvent(this.world.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ()), source, result);
+ this.world.getServer().getPluginManager().callEvent(furnaceSmeltEvent);
+
+ if (furnaceSmeltEvent.isCancelled()) {
+ return;
+ }
+
+ result = furnaceSmeltEvent.getResult();
2016-11-17 02:41:03 +01:00
+ itemstack1 = CraftItemStack.asNMSCopy(result);
+
2016-11-17 02:41:03 +01:00
+ if (!itemstack1.isEmpty()) {
+ if (itemstack2.isEmpty()) {
+ this.items.set(2, itemstack1.cloneItemStack());
+ } else if (CraftItemStack.asCraftMirror(itemstack2).isSimilar(result)) {
+ itemstack2.add(itemstack1.getCount());
+ } else {
+ return;
+ }
+ }
2015-02-26 23:41:06 +01:00
+
+ /*
2016-11-17 02:41:03 +01:00
if (itemstack2.isEmpty()) {
this.items.set(2, itemstack1.cloneItemStack());
} else if (itemstack2.getItem() == itemstack1.getItem()) {
itemstack2.add(1);
}
+ */
+ // CraftBukkit end
2018-07-15 02:00:00 +02:00
if (!this.world.isClientSide) {
2019-04-23 04:00:00 +02:00
this.a(irecipe);
2020-06-25 02:00:00 +02:00
@@ -319,7 +397,7 @@
2019-04-23 04:00:00 +02:00
}
protected int getRecipeCookingTime() {
2020-06-25 02:00:00 +02:00
- return (Integer) this.world.getCraftingManager().craft(this.c, this, this.world).map(RecipeCooking::getCookingTime).orElse(200);
+ return (this.hasWorld()) ? (Integer) this.world.getCraftingManager().craft((Recipes<RecipeCooking>) this.c, this, this.world).map(RecipeCooking::getCookingTime).orElse(200) : 200; // CraftBukkit - SPIGOT-4302 // Eclipse fail
2019-04-23 04:00:00 +02:00
}
public static boolean isFuel(ItemStack itemstack) {
2020-06-25 02:00:00 +02:00
@@ -446,14 +524,20 @@
2019-04-23 04:00:00 +02:00
@Override
public void b(EntityHuman entityhuman) {}
- public void d(EntityHuman entityhuman) {
2020-06-25 02:00:00 +02:00
- List<IRecipe<?>> list = this.a(entityhuman.world, entityhuman.getPositionVector());
2019-04-23 04:00:00 +02:00
+ public void d(EntityHuman entityhuman, ItemStack itemstack, int amount) { // CraftBukkit
2020-06-25 02:00:00 +02:00
+ List<IRecipe<?>> list = this.a(entityhuman.world, entityhuman.getPositionVector(), entityhuman, itemstack, amount); // CraftBukkit
entityhuman.discoverRecipes(list);
this.n.clear();
}
public List<IRecipe<?>> a(World world, Vec3D vec3d) {
+ // CraftBukkit start
+ return this.a(world, vec3d, null, null, 0);
+ }
+
+ public List<IRecipe<?>> a(World world, Vec3D vec3d, EntityHuman entityhuman, ItemStack itemstack, int amount) {
+ // CraftBukkit end
2019-04-23 04:00:00 +02:00
List<IRecipe<?>> list = Lists.newArrayList();
2020-06-25 02:00:00 +02:00
ObjectIterator objectiterator = this.n.object2IntEntrySet().iterator();
2019-04-23 04:00:00 +02:00
2020-06-25 02:00:00 +02:00
@@ -462,14 +546,14 @@
2019-04-23 04:00:00 +02:00
2020-08-11 23:00:00 +02:00
world.getCraftingManager().getRecipe((MinecraftKey) entry.getKey()).ifPresent((irecipe) -> {
2019-04-23 04:00:00 +02:00
list.add(irecipe);
2020-06-25 02:00:00 +02:00
- a(world, vec3d, entry.getIntValue(), ((RecipeCooking) irecipe).getExperience());
+ a(world, vec3d, entry.getIntValue(), ((RecipeCooking) irecipe).getExperience(), entityhuman, itemstack, amount); // CraftBukkit
2019-04-23 04:00:00 +02:00
});
}
2020-06-25 02:00:00 +02:00
return list;
2019-04-23 04:00:00 +02:00
}
2020-06-25 02:00:00 +02:00
- private static void a(World world, Vec3D vec3d, int i, float f) {
+ private void a(World world, Vec3D vec3d, int i, float f, EntityHuman entityhuman, ItemStack itemstack, int amount) { // CraftBukkit
int j = MathHelper.d((float) i * f);
float f1 = MathHelper.h((float) i * f);
2019-04-23 04:00:00 +02:00
2020-06-25 02:00:00 +02:00
@@ -477,6 +561,14 @@
++j;
2019-04-23 04:00:00 +02:00
}
+ // CraftBukkit start - fire FurnaceExtractEvent
+ if (amount != 0) {
2020-06-25 02:00:00 +02:00
+ FurnaceExtractEvent event = new FurnaceExtractEvent((Player) entityhuman.getBukkitEntity(), CraftBlock.at(world, position), org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(itemstack.getItem()), amount, j);
2019-04-23 04:00:00 +02:00
+ world.getServer().getPluginManager().callEvent(event);
2020-06-25 02:00:00 +02:00
+ j = event.getExpToDrop();
2019-04-23 04:00:00 +02:00
+ }
+ // CraftBukkit end
+
2020-06-25 02:00:00 +02:00
while (j > 0) {
int k = EntityExperienceOrb.getOrbValue(j);