Paper/Spigot-Server-Patches/0562-Add-BellRingEvent.patch
Mariell Hoversholm 654b792caf Updated Upstream (CraftBukkit)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
a339310c #755: Fix NPE when calling getInventory() for virtual EnderChests
2577f9bf Increase outdated build delay
1dabfdc8 #754: Fix pre-1.16 serialized SkullMeta being broken on 1.16+, losing textures
2020-09-27 11:04:51 -04:00

50 lines
2.5 KiB
Diff

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Eearslya Sleiarion <eearslya@gmail.com>
Date: Sun, 23 Aug 2020 13:04:02 +0200
Subject: [PATCH] Add BellRingEvent
Add a new event, BellRingEvent, to trigger whenever a player rings a
village bell. Passes along the bell block and the player who rang it.
diff --git a/src/main/java/net/minecraft/server/BlockBell.java b/src/main/java/net/minecraft/server/BlockBell.java
index 2ef899c761120a9fd6a9edcca23dea62d58688e6..25c72672eb2c5268d0dc13e29b30efbb9b519cd4 100644
--- a/src/main/java/net/minecraft/server/BlockBell.java
+++ b/src/main/java/net/minecraft/server/BlockBell.java
@@ -1,5 +1,7 @@
package net.minecraft.server;
+import io.papermc.paper.event.block.BellRingEvent;
+
import javax.annotation.Nullable;
public class BlockBell extends BlockTileEntity {
@@ -58,7 +60,7 @@ public class BlockBell extends BlockTileEntity {
boolean flag1 = !flag || this.a(iblockdata, enumdirection, movingobjectpositionblock.getPos().y - (double) blockposition.getY());
if (flag1) {
- boolean flag2 = this.a(world, blockposition, enumdirection);
+ boolean flag2 = this.handleBellRing(world, blockposition, enumdirection, entityhuman); // Paper
if (flag2 && entityhuman != null) {
entityhuman.a(StatisticList.BELL_RING);
@@ -92,6 +94,11 @@ public class BlockBell extends BlockTileEntity {
}
public boolean a(World world, BlockPosition blockposition, @Nullable EnumDirection enumdirection) {
+ // Paper start - add ringer param
+ return this.handleBellRing(world, blockposition, enumdirection, null);
+ }
+ public boolean handleBellRing(World world, BlockPosition blockposition, @Nullable EnumDirection enumdirection, @Nullable Entity ringer) {
+ // Paper end
TileEntity tileentity = world.getTileEntity(blockposition);
if (!world.isClientSide && tileentity instanceof TileEntityBell) {
@@ -99,6 +106,7 @@ public class BlockBell extends BlockTileEntity {
enumdirection = (EnumDirection) world.getType(blockposition).get(BlockBell.a);
}
+ if (!new BellRingEvent(world.getWorld().getBlockAt(MCUtil.toLocation(world, blockposition)), ringer == null ? null : ringer.getBukkitEntity()).callEvent()) return false; // Paper - BellRingEvent
((TileEntityBell) tileentity).a(enumdirection);
world.playSound((EntityHuman) null, blockposition, SoundEffects.BLOCK_BELL_USE, SoundCategory.BLOCKS, 2.0F, 1.0F);
return true;