Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add dispenserSpawnEntity event (1.19.4) #10669

Open
wants to merge 2 commits into
base: ver/1.19.4
Choose a base branch
from
Open

Add dispenserSpawnEntity event (1.19.4) #10669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa38e93
Add dispenserSpawnEntity event
DerToaster98 May 6, 2024
7db7eab
add nullable annotation to entity
DerToaster98 May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
74 changes: 74 additions & 0 deletions patches/api/0418-Add-DispenserSpawnEntityEvent.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: DerToaster98 <38782719+DerToaster98@users.noreply.github.com>
Date: Mon, 6 May 2024 12:33:00 +0200
Subject: [PATCH] Add DispenserSpawnEntityEvent


diff --git a/src/main/java/org/bukkit/event/block/DispenserSpawnEntityEvent.java b/src/main/java/org/bukkit/event/block/DispenserSpawnEntityEvent.java
new file mode 100644
index 0000000000000000000000000000000000000000..2207e9a3601ff67f3b9c13c6c23ad7c3d2a710aa
--- /dev/null
+++ b/src/main/java/org/bukkit/event/block/DispenserSpawnEntityEvent.java
@@ -0,0 +1,61 @@
+package org.bukkit.event.block;
+
+import javax.annotation.Nullable;
+
+import org.bukkit.block.Block;
+import org.bukkit.entity.Entity;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+
+
+/**
+ *
+ * @author DerToaster98
+ *
+ * Called whenever a entity will be spawned by a dispenser.
+ * This includes:
+ * - projectiles
+ * - primed tnt
+ * - spawn eggs
+ * - boats
+ * - minecarts
+ *
+ * Cancelling will cancel the entire action => no item shrinking etc.
+ *
+ */
+public class DispenserSpawnEntityEvent extends BlockEvent implements Cancellable {
+
+ private static final HandlerList handlers = new HandlerList();
+ private boolean cancelled = false;
+ private final @Nullable Entity entity;
+
+ public DispenserSpawnEntityEvent(@NotNull Block block, @Nullable Entity entity) {
+ super(block);
+ this.entity = entity;
+ }
+
+ @Nullable
+ public Entity getEntity() {
+ return this.entity;
+ }
+
+ @Override
+ public boolean isCancelled() {
+ return this.cancelled;
+ }
+
+ @Override
+ public void setCancelled(boolean cancel) {
+ this.cancelled = cancel;
+ }
+
+ @Override
+ public @NotNull HandlerList getHandlers() {
+ return handlers;
+ }
+
+ @NotNull
+ public static HandlerList getHandlerList() {
+ return handlers;
+ }
+}
152 changes: 152 additions & 0 deletions patches/server/0987-Add-event-to-fire-when-a-dispenser-will-spawn-a-enti.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: DerToaster98 <38782719+DerToaster98@users.noreply.github.com>
Date: Mon, 6 May 2024 12:27:04 +0200
Subject: [PATCH] Add event to fire when a dispenser will spawn a entity
(mostly projectiles!)


diff --git a/src/main/java/net/minecraft/core/dispenser/AbstractProjectileDispenseBehavior.java b/src/main/java/net/minecraft/core/dispenser/AbstractProjectileDispenseBehavior.java
index 309ad5a1da6b3a297d5526cd9247359ac5f49406..af760d764319134efc37d30745d23e4808f703d4 100644
--- a/src/main/java/net/minecraft/core/dispenser/AbstractProjectileDispenseBehavior.java
+++ b/src/main/java/net/minecraft/core/dispenser/AbstractProjectileDispenseBehavior.java
@@ -1,9 +1,10 @@
package net.minecraft.core.dispenser;

-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.DispenserBlock;
-import net.minecraft.world.level.block.entity.DispenserBlockEntity;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.event.block.BlockDispenseEvent;
+// CraftBukkit end
+import org.bukkit.event.block.DispenserSpawnEntityEvent;
+
import net.minecraft.core.BlockSource;
import net.minecraft.core.Direction;
import net.minecraft.core.Position;
@@ -11,9 +12,10 @@ import net.minecraft.server.level.ServerLevel;
// CraftBukkit start
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.projectile.Projectile;
-import org.bukkit.craftbukkit.inventory.CraftItemStack;
-import org.bukkit.event.block.BlockDispenseEvent;
-// CraftBukkit end
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.DispenserBlock;
+import net.minecraft.world.level.block.entity.DispenserBlockEntity;

public abstract class AbstractProjectileDispenseBehavior extends DefaultDispenseItemBehavior {

@@ -53,6 +55,14 @@ public abstract class AbstractProjectileDispenseBehavior extends DefaultDispense
return stack;
}
}
+
+ DispenserSpawnEntityEvent spawnEvent = new DispenserSpawnEntityEvent(block, iprojectile.getBukkitEntity());
+ if (!DispenserBlock.eventFired) {
+ worldserver.getCraftServer().getPluginManager().callEvent(spawnEvent);
+ }
+ if (spawnEvent.isCancelled()) {
+ return stack;
+ }

iprojectile.shoot(event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ(), this.getPower(), this.getUncertainty());
((Entity) iprojectile).projectileSource = new org.bukkit.craftbukkit.projectiles.CraftBlockProjectileSource((DispenserBlockEntity) pointer.getEntity());
diff --git a/src/main/java/net/minecraft/core/dispenser/BoatDispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/BoatDispenseItemBehavior.java
index 958134519befadc27a5b647caf64acf272ee2db4..8d0a8bfeed2a138ecc96af774beace402b9d0df2 100644
--- a/src/main/java/net/minecraft/core/dispenser/BoatDispenseItemBehavior.java
+++ b/src/main/java/net/minecraft/core/dispenser/BoatDispenseItemBehavior.java
@@ -14,6 +14,7 @@ import net.minecraft.world.level.block.DispenserBlock;
import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.event.block.BlockDispenseEvent;
// CraftBukkit end
+import org.bukkit.event.block.DispenserSpawnEntityEvent;

public class BoatDispenseItemBehavior extends DefaultDispenseItemBehavior {

@@ -80,6 +81,14 @@ public class BoatDispenseItemBehavior extends DefaultDispenseItemBehavior {
}

Object object = this.isChestBoat ? new ChestBoat(worldserver, event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ()) : new Boat(worldserver, event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ());
+
+ DispenserSpawnEntityEvent spawnEvent = new DispenserSpawnEntityEvent(block, ((Entity)object).getBukkitEntity());
+ if (!DispenserBlock.eventFired) {
+ worldserver.getCraftServer().getPluginManager().callEvent(spawnEvent);
+ }
+ if (spawnEvent.isCancelled()) {
+ return stack;
+ }
// CraftBukkit end

((Boat) object).setVariant(this.type);
diff --git a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
index 88d18d18d69876c98e199acb647c6cca9448d55d..f845afbb73d2c339d575e793aaedffff7808ef19 100644
--- a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
+++ b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
@@ -89,6 +89,7 @@ import org.bukkit.craftbukkit.util.DummyGeneratorAccess;
import org.bukkit.event.block.BlockDispenseArmorEvent;
import org.bukkit.event.block.BlockDispenseEvent;
import org.bukkit.event.block.BlockFertilizeEvent;
+import org.bukkit.event.block.DispenserSpawnEntityEvent;
import org.bukkit.event.world.StructureGrowEvent;
// CraftBukkit end

@@ -298,13 +299,24 @@ public interface DispenseItemBehavior {
return stack;
}
}
- // CraftBukkit end
-
+
Consumer<ArmorStand> consumer = EntityType.appendDefaultStackConfig((entityarmorstand) -> {
entityarmorstand.setYRot(enumdirection.toYRot());
}, worldserver, stack, (Player) null);
ArmorStand entityarmorstand = (ArmorStand) EntityType.ARMOR_STAND.spawn(worldserver, stack.getTag(), consumer, blockposition, MobSpawnType.DISPENSER, false, false);

+ DispenserSpawnEntityEvent spawnEvent = new DispenserSpawnEntityEvent(block, entityarmorstand.getBukkitEntity());
+ if (!DispenserBlock.eventFired) {
+ worldserver.getCraftServer().getPluginManager().callEvent(spawnEvent);
+ }
+ if (spawnEvent.isCancelled()) {
+ if (entityarmorstand != null) {
+ entityarmorstand.discard();
+ }
+ return stack;
+ }
+ // CraftBukkit end
+
if (entityarmorstand != null) {
if (shrink) stack.shrink(1); // Paper - actually handle here
}
@@ -585,6 +597,14 @@ public interface DispenseItemBehavior {
SmallFireball entitysmallfireball = new SmallFireball(worldserver, d0, d1, d2, event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ());
entitysmallfireball.setItem(itemstack1);
entitysmallfireball.projectileSource = new org.bukkit.craftbukkit.projectiles.CraftBlockProjectileSource((DispenserBlockEntity) pointer.getEntity());
+
+ DispenserSpawnEntityEvent spawnEvent = new DispenserSpawnEntityEvent(block, entitysmallfireball.getBukkitEntity());
+ if (!DispenserBlock.eventFired) {
+ worldserver.getCraftServer().getPluginManager().callEvent(spawnEvent);
+ }
+ if (spawnEvent.isCancelled()) {
+ return stack;
+ }

worldserver.addFreshEntity(entitysmallfireball);
if (shrink) stack.shrink(1); // Paper - actually handle here
@@ -906,6 +926,15 @@ public interface DispenseItemBehavior {
}

PrimedTnt entitytntprimed = new PrimedTnt(worldserver, event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ(), (LivingEntity) null);
+
+ DispenserSpawnEntityEvent spawnEvent = new DispenserSpawnEntityEvent(block, entitytntprimed.getBukkitEntity());
+ if (!DispenserBlock.eventFired) {
+ worldserver.getCraftServer().getPluginManager().callEvent(spawnEvent);
+ }
+ if (spawnEvent.isCancelled()) {
+ return stack;
+ }
+
// CraftBukkit end

worldserver.addFreshEntity(entitytntprimed);