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 22edad7e7faa29155dac1abe9f21781ab1390da6..7721b3ca951054d73b2fbf28c01a7c02b5416451 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 }