Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-16 19:40:07 +01:00
275173e538
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 0c5d8709 SPIGOT-7400: Downgrade maven-resolver due to issues resolving certain depends 255c4fdb SPIGOT-7380: Add PlayerInteractEvent#getClickedPosition and ChiseledBookshelf#getSlot CraftBukkit Changes: b6b514b7e SPIGOT-7400: Downgrade maven-resolver due to issues resolving certain depends fcff84de9 SPIGOT-7399: Revert null check in CraftMetaItem#safelyAdd 44a4b5649 SPIGOT-7380: Add PlayerInteractEvent#getClickedPosition and ChiseledBookshelf#getSlot 676969d01 SPIGOT-7389: Handle setting null items in ChiseledBookshelf Inventory
46 Zeilen
2.4 KiB
Diff
46 Zeilen
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Noah van der Aa <ndvdaa@gmail.com>
|
|
Date: Sun, 8 Aug 2021 19:56:02 +0200
|
|
Subject: [PATCH] Add CompostItemEvent and EntityCompostItemEvent
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
|
|
index 113083f1b909e3e279789d67e24af36dc0f151bf..87153b5576fed05103183a9860d804c2c8cfbe1c 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
|
|
@@ -322,7 +322,21 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
|
|
int i = (Integer) iblockdata.getValue(ComposterBlock.LEVEL);
|
|
float f = ComposterBlock.COMPOSTABLES.getFloat(itemstack.getItem());
|
|
|
|
- if ((i != 0 || f <= 0.0F) && rand >= (double) f) {
|
|
+ // Paper start
|
|
+ boolean willRaiseLevel = !((i != 0 || f <= 0.0F) && rand >= (double) f);
|
|
+ final io.papermc.paper.event.block.CompostItemEvent event;
|
|
+ if (entity == null) {
|
|
+ event = new io.papermc.paper.event.block.CompostItemEvent(org.bukkit.craftbukkit.block.CraftBlock.at(generatoraccess, blockposition), itemstack.getBukkitStack(), willRaiseLevel);
|
|
+ } else {
|
|
+ event = new io.papermc.paper.event.entity.EntityCompostItemEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(generatoraccess, blockposition), itemstack.getBukkitStack(), willRaiseLevel);
|
|
+ }
|
|
+ if (!event.callEvent()) { // check for cancellation of entity event (non entity event can't be cancelled cause of hoppers)
|
|
+ return null;
|
|
+ }
|
|
+ willRaiseLevel = event.willRaiseLevel();
|
|
+
|
|
+ if (!willRaiseLevel) {
|
|
+ // Paper end
|
|
return iblockdata;
|
|
} else {
|
|
int j = i + 1;
|
|
@@ -472,6 +486,11 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
|
|
this.changed = true;
|
|
BlockState iblockdata = ComposterBlock.addItem((Entity) null, this.state, this.level, this.pos, itemstack);
|
|
|
|
+ // Paper start
|
|
+ if (iblockdata == null) {
|
|
+ return;
|
|
+ }
|
|
+ // Paper end
|
|
this.level.levelEvent(1500, this.pos, iblockdata != this.state ? 1 : 0);
|
|
this.removeItemNoUpdate(0);
|
|
}
|