mirror of
https://github.com/PaperMC/Paper.git
synced 2024-06-25 06:14:50 +02:00
e792da723a
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 Bukkit Changes: 30885166 Update to Minecraft 1.16.4 CraftBukkit Changes: 3af81c71 Update to Minecraft 1.16.4 Spigot Changes: f011ca24 Update to Minecraft 1.16.4 Co-authored-by: Mariell Hoversholm <proximyst@proximyst.com>
50 lines
2.5 KiB
Diff
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;
|