diff options
author | Shane Freeder <[email protected]> | 2024-05-09 14:51:33 +0100 |
---|---|---|
committer | Shane Freeder <[email protected]> | 2024-05-09 14:51:33 +0100 |
commit | 3693bbdc6b65e68db10375d3eeab70f06708b729 (patch) | |
tree | 4a71a5e6e5f50b3e2937053a5d4b4196ef67665b /patches/api/0400-Add-CompostItemEvent-and-EntityCompostItemEvent.patch | |
parent | f2512b12385961f8ca1f69efebe5ed0e00c0caa8 (diff) | |
download | Paper-3693bbdc6b65e68db10375d3eeab70f06708b729.tar.gz Paper-3693bbdc6b65e68db10375d3eeab70f06708b729.zip |
Use internals for getting block/entity countstimings/use-internals
For a long time I've been meaning to move some of this logic internally
as this would allow us to avoid hitting systems like block state snapshots
which can create issues as many of the spigot implementations of this
stuff are increasingly broken, leading to unexpected crashes during ticking,
even if the API cannot properly interact with these such states/items,
it's generally more preferable to not crash the server in the course,
and just let those interactions fail more gracefully.
Diffstat (limited to 'patches/api/0400-Add-CompostItemEvent-and-EntityCompostItemEvent.patch')
-rw-r--r-- | patches/api/0400-Add-CompostItemEvent-and-EntityCompostItemEvent.patch | 130 |
1 files changed, 130 insertions, 0 deletions
diff --git a/patches/api/0400-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/api/0400-Add-CompostItemEvent-and-EntityCompostItemEvent.patch new file mode 100644 index 0000000000..9dee250212 --- /dev/null +++ b/patches/api/0400-Add-CompostItemEvent-and-EntityCompostItemEvent.patch @@ -0,0 +1,130 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Noah van der Aa <[email protected]> +Date: Sat, 7 Aug 2021 15:11:27 +0200 +Subject: [PATCH] Add CompostItemEvent and EntityCompostItemEvent + + +diff --git a/src/main/java/io/papermc/paper/event/block/CompostItemEvent.java b/src/main/java/io/papermc/paper/event/block/CompostItemEvent.java +new file mode 100644 +index 0000000000000000000000000000000000000000..29f21c03cc063a279ca4ae0be00e9ef43f45be9a +--- /dev/null ++++ b/src/main/java/io/papermc/paper/event/block/CompostItemEvent.java +@@ -0,0 +1,67 @@ ++package io.papermc.paper.event.block; ++ ++import org.bukkit.block.Block; ++import org.bukkit.event.HandlerList; ++import org.bukkit.event.block.BlockEvent; ++import org.bukkit.event.inventory.InventoryMoveItemEvent; ++import org.bukkit.inventory.ItemStack; ++import org.jetbrains.annotations.ApiStatus; ++import org.jetbrains.annotations.NotNull; ++ ++/** ++ * Called when an item is about to be composted by a hopper. ++ * To prevent hoppers from moving items into composters, cancel the {@link InventoryMoveItemEvent}. ++ */ ++public class CompostItemEvent extends BlockEvent { ++ ++ private static final HandlerList HANDLER_LIST = new HandlerList(); ++ ++ private final ItemStack item; ++ private boolean willRaiseLevel; ++ ++ @ApiStatus.Internal ++ public CompostItemEvent(@NotNull Block composter, @NotNull ItemStack item, boolean willRaiseLevel) { ++ super(composter); ++ this.item = item; ++ this.willRaiseLevel = willRaiseLevel; ++ } ++ ++ /** ++ * Gets the item that was used on the composter. ++ * ++ * @return the item ++ */ ++ @NotNull ++ public ItemStack getItem() { ++ return this.item; ++ } ++ ++ /** ++ * Gets whether the composter will rise a level. ++ * ++ * @return {@code true} if successful ++ */ ++ public boolean willRaiseLevel() { ++ return this.willRaiseLevel; ++ } ++ ++ /** ++ * Sets whether the composter will rise a level. ++ * ++ * @param willRaiseLevel {@code true} if the composter should rise a level ++ */ ++ public void setWillRaiseLevel(boolean willRaiseLevel) { ++ this.willRaiseLevel = willRaiseLevel; ++ } ++ ++ @Override ++ public @NotNull HandlerList getHandlers() { ++ return HANDLER_LIST; ++ } ++ ++ @NotNull ++ public static HandlerList getHandlerList() { ++ return HANDLER_LIST; ++ } ++ ++} +diff --git a/src/main/java/io/papermc/paper/event/entity/EntityCompostItemEvent.java b/src/main/java/io/papermc/paper/event/entity/EntityCompostItemEvent.java +new file mode 100644 +index 0000000000000000000000000000000000000000..ba8473ec936b1cea8b13b269283c377cb1b6da0b +--- /dev/null ++++ b/src/main/java/io/papermc/paper/event/entity/EntityCompostItemEvent.java +@@ -0,0 +1,45 @@ ++package io.papermc.paper.event.entity; ++ ++import io.papermc.paper.event.block.CompostItemEvent; ++import org.bukkit.block.Block; ++import org.bukkit.entity.Entity; ++import org.bukkit.event.Cancellable; ++import org.bukkit.inventory.ItemStack; ++import org.jetbrains.annotations.ApiStatus; ++import org.jetbrains.annotations.NotNull; ++ ++/** ++ * Called when an item is about to be composted by an entity. ++ */ ++public class EntityCompostItemEvent extends CompostItemEvent implements Cancellable { ++ ++ private final Entity entity; ++ private boolean cancelled; ++ ++ @ApiStatus.Internal ++ public EntityCompostItemEvent(@NotNull Entity entity, @NotNull Block composter, @NotNull ItemStack item, boolean willRaiseLevel) { ++ super(composter, item, willRaiseLevel); ++ this.entity = entity; ++ } ++ ++ /** ++ * Gets the entity that interacted with the composter. ++ * ++ * @return the entity that composted an item. ++ */ ++ @NotNull ++ public Entity getEntity() { ++ return this.entity; ++ } ++ ++ @Override ++ public boolean isCancelled() { ++ return this.cancelled; ++ } ++ ++ @Override ++ public void setCancelled(boolean cancel) { ++ this.cancelled = cancel; ++ } ++ ++} |