From c7cdf255bff157a7c9bd73997c393970f817c704 Mon Sep 17 00:00:00 2001 From: TheViperShow <29604693+TheViperShow@users.noreply.github.com> Date: Sun, 29 Nov 2020 00:38:52 +0100 Subject: [PATCH] Add BlockFailedDispenseEvent Co-authored-by: MiniDigger --- .../0254-Add-BlockFailedDispenseEvent.patch | 69 +++++++++++ ...Implemented-BlockFailedDispenseEvent.patch | 107 ++++++++++++++++++ 2 files changed, 176 insertions(+) create mode 100644 Spigot-API-Patches/0254-Add-BlockFailedDispenseEvent.patch create mode 100644 Spigot-Server-Patches/0641-Implemented-BlockFailedDispenseEvent.patch diff --git a/Spigot-API-Patches/0254-Add-BlockFailedDispenseEvent.patch b/Spigot-API-Patches/0254-Add-BlockFailedDispenseEvent.patch new file mode 100644 index 000000000..126714b96 --- /dev/null +++ b/Spigot-API-Patches/0254-Add-BlockFailedDispenseEvent.patch @@ -0,0 +1,69 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: TheViperShow <29604693+TheViperShow@users.noreply.github.com> +Date: Wed, 22 Apr 2020 09:40:23 +0200 +Subject: [PATCH] Add BlockFailedDispenseEvent + + +diff --git a/src/main/java/io/papermc/paper/event/block/BlockFailedDispenseEvent.java b/src/main/java/io/papermc/paper/event/block/BlockFailedDispenseEvent.java +new file mode 100644 +index 0000000000000000000000000000000000000000..dab794341170ed10d5a05c1b4c180d164e0f70e2 +--- /dev/null ++++ b/src/main/java/io/papermc/paper/event/block/BlockFailedDispenseEvent.java +@@ -0,0 +1,57 @@ ++package io.papermc.paper.event.block; ++ ++import org.bukkit.block.Block; ++import org.bukkit.event.HandlerList; ++import org.bukkit.event.block.BlockEvent; ++import org.jetbrains.annotations.NotNull; ++ ++/** ++ * Called when a block tries to dispense an item, but its inventory is empty. ++ */ ++public class BlockFailedDispenseEvent extends BlockEvent { ++ private static final HandlerList handlers = new HandlerList(); ++ ++ private boolean shouldPlayEffect = true; ++ ++ public BlockFailedDispenseEvent(@NotNull Block theBlock) { ++ super(theBlock); ++ } ++ ++ /** ++ * @return if the effect should be played ++ */ ++ public boolean shouldPlayEffect() { ++ return this.shouldPlayEffect; ++ } ++ ++ /** ++ * Sets if the effect for empty dispensers should be played ++ * ++ * @param playEffect if the effect should be played ++ */ ++ public void shouldPlayEffect(boolean playEffect) { ++ this.shouldPlayEffect = playEffect; ++ } ++ ++ /** ++ * {@inheritDoc} ++ * ++ * @return {@link #shouldPlayEffect()} ++ */ ++ @Override ++ public boolean callEvent() { ++ super.callEvent(); ++ return this.shouldPlayEffect(); ++ } ++ ++ @Override ++ public @NotNull ++ HandlerList getHandlers() { ++ return handlers; ++ } ++ ++ public static @NotNull ++ HandlerList getHandlerList() { ++ return handlers; ++ } ++} diff --git a/Spigot-Server-Patches/0641-Implemented-BlockFailedDispenseEvent.patch b/Spigot-Server-Patches/0641-Implemented-BlockFailedDispenseEvent.patch new file mode 100644 index 000000000..a0396abdd --- /dev/null +++ b/Spigot-Server-Patches/0641-Implemented-BlockFailedDispenseEvent.patch @@ -0,0 +1,107 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: TheViperShow <29604693+TheViperShow@users.noreply.github.com> +Date: Wed, 22 Apr 2020 09:40:38 +0200 +Subject: [PATCH] Implemented BlockFailedDispenseEvent + + +diff --git a/src/main/java/net/minecraft/server/BlockDispenser.java b/src/main/java/net/minecraft/server/BlockDispenser.java +index c239265581972d67c7567d7545d62499ebadd195..063453552b7b6c2395c8f9be27cdb71a15a56ca4 100644 +--- a/src/main/java/net/minecraft/server/BlockDispenser.java ++++ b/src/main/java/net/minecraft/server/BlockDispenser.java +@@ -48,6 +48,7 @@ public class BlockDispenser extends BlockTileEntity { + int i = tileentitydispenser.h(); + + if (i < 0) { ++ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFailedDispenseEvent(worldserver, blockposition)) // Paper - BlockFailedDispenseEvent is called here + worldserver.triggerEffect(1001, blockposition, 0); + } else { + ItemStack itemstack = tileentitydispenser.getItem(i); +diff --git a/src/main/java/net/minecraft/server/BlockDropper.java b/src/main/java/net/minecraft/server/BlockDropper.java +index 65c212690d8ba7c8ea55d4d3b6af1ba3d9f4a7f6..22ab5a861920e1902c64301c3b06cf95b7afe378 100644 +--- a/src/main/java/net/minecraft/server/BlockDropper.java ++++ b/src/main/java/net/minecraft/server/BlockDropper.java +@@ -30,6 +30,7 @@ public class BlockDropper extends BlockDispenser { + int i = tileentitydispenser.h(); + + if (i < 0) { ++ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFailedDispenseEvent(worldserver, blockposition)) // Paper - BlockFailedDispenseEvent is called here + worldserver.triggerEffect(1001, blockposition, 0); + } else { + ItemStack itemstack = tileentitydispenser.getItem(i); +diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +index 345bce7bbf0a9391d70be7aa5530d394273842aa..4534d22aec95cf247daf7575472acd0eba91a3c9 100644 +--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java ++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +@@ -4,6 +4,7 @@ import com.google.common.base.Function; + import com.google.common.base.Functions; + import com.google.common.collect.Lists; + import com.mojang.datafixers.util.Either; ++import io.papermc.paper.event.block.BlockFailedDispenseEvent; + import java.net.InetAddress; + import java.util.ArrayList; + import java.util.Collections; +@@ -22,7 +23,6 @@ import net.minecraft.server.EntityAnimal; + import net.minecraft.server.EntityAreaEffectCloud; + import net.minecraft.server.EntityDamageSource; + import net.minecraft.server.EntityDamageSourceIndirect; +-import net.minecraft.server.EntityEnderCrystal; + import net.minecraft.server.EntityEnderDragon; + import net.minecraft.server.EntityExperienceOrb; + import net.minecraft.server.EntityFireworks; +@@ -44,11 +44,9 @@ import net.minecraft.server.EntityVillager; + import net.minecraft.server.EntityWaterAnimal; + import net.minecraft.server.EnumDirection; + import net.minecraft.server.EnumHand; +-import net.minecraft.server.EnumItemSlot; + import net.minecraft.server.Explosion; + import net.minecraft.server.GeneratorAccess; + import net.minecraft.server.IBlockData; +-import net.minecraft.server.IChatBaseComponent; + import net.minecraft.server.IInventory; + import net.minecraft.server.IProjectile; + import net.minecraft.server.ItemActionContext; +@@ -69,7 +67,6 @@ import net.minecraft.server.Unit; + import net.minecraft.server.World; + import net.minecraft.server.WorldServer; + import org.bukkit.Bukkit; +-import org.bukkit.Location; + import org.bukkit.Material; + import org.bukkit.NamespacedKey; + import org.bukkit.Server; +@@ -121,7 +118,6 @@ import org.bukkit.entity.ThrownPotion; + import org.bukkit.entity.Vehicle; + import org.bukkit.entity.Villager; + import org.bukkit.entity.Villager.Profession; +-import org.bukkit.entity.ExperienceOrb; // Paper + import org.bukkit.event.Cancellable; + import org.bukkit.event.Event; + import org.bukkit.event.Event.Result; +@@ -162,7 +158,6 @@ import org.bukkit.event.entity.EntityDeathEvent; + import org.bukkit.event.entity.EntityEnterLoveModeEvent; + import org.bukkit.event.entity.EntityPickupItemEvent; + import org.bukkit.event.entity.EntityPlaceEvent; +-import org.bukkit.event.entity.EntityPortalEvent; + import org.bukkit.event.entity.EntityPotionEffectEvent; + import org.bukkit.event.entity.EntityShootBowEvent; + import org.bukkit.event.entity.EntitySpawnEvent; +@@ -221,7 +216,6 @@ import org.bukkit.inventory.EquipmentSlot; + import org.bukkit.inventory.InventoryView; + import org.bukkit.inventory.meta.BookMeta; + import org.bukkit.potion.PotionEffect; +-import org.bukkit.projectiles.ProjectileSource; + + import org.bukkit.event.entity.SpawnerSpawnEvent; // Spigot + +@@ -1758,4 +1752,12 @@ public class CraftEventFactory { + + return event; + } ++ ++ // Paper start ++ public static boolean handleBlockFailedDispenseEvent(WorldServer worldserver, BlockPosition blockposition) { ++ org.bukkit.block.Block block = worldserver.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()); ++ BlockFailedDispenseEvent event = new BlockFailedDispenseEvent(block); ++ return event.callEvent(); ++ } ++ // Paper end + }