9147456fc9
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 CraftBukkit Changes: ab8ace685 SPIGOT-7236: Bone meal doesn't increase use statistic 7dcb59b8e Avoid switch on material in previous commit Spigot Changes: 19641c75 SPIGOT-7235: World.Spigot#strikeLightningEffect doesn't do anything
29 Zeilen
1.6 KiB
Diff
29 Zeilen
1.6 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/world/level/block/BellBlock.java b/src/main/java/net/minecraft/world/level/block/BellBlock.java
|
|
index 8ccf71bddb2637a9e468e3d958665bbd58c37647..8878d8882d7aee4d44ad8339daff180812912649 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/BellBlock.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/BellBlock.java
|
|
@@ -3,6 +3,7 @@ package net.minecraft.world.level.block;
|
|
import javax.annotation.Nullable;
|
|
import net.minecraft.core.BlockPos;
|
|
import net.minecraft.core.Direction;
|
|
+import io.papermc.paper.util.MCUtil;
|
|
import net.minecraft.sounds.SoundEvents;
|
|
import net.minecraft.sounds.SoundSource;
|
|
import net.minecraft.stats.Stats;
|
|
@@ -131,6 +132,7 @@ public class BellBlock extends BaseEntityBlock {
|
|
direction = world.getBlockState(pos).getValue(FACING);
|
|
}
|
|
|
|
+ if (!new io.papermc.paper.event.block.BellRingEvent(world.getWorld().getBlockAt(MCUtil.toLocation(world, pos)), entity == null ? null : entity.getBukkitEntity()).callEvent()) return false; // Paper - BellRingEvent
|
|
((BellBlockEntity)blockEntity).onHit(direction);
|
|
world.playSound((Player)null, pos, SoundEvents.BELL_BLOCK, SoundSource.BLOCKS, 2.0F, 1.0F);
|
|
world.gameEvent(entity, GameEvent.BLOCK_CHANGE, pos);
|