SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#1160: Add more bell API

Browse Source 
By: Parker Hawke <hawkeboyz2@hotmail.com>
This commit is contained in:
CraftBukkit/Spigot
2023-04-02 14:35:13 +10:00
parent a9bdb77af1
commit 496189d962
4 changed files with 127 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
paper-server/nms-patches/net/minecraft/world/level/block/BlockBell.patch Normal file
View File

@@ -0,0 +1,14 @@
--- a/net/minecraft/world/level/block/BlockBell.java
+++ b/net/minecraft/world/level/block/BlockBell.java
@@ -137,6 +137,11 @@
if (enumdirection == null) {
enumdirection = (EnumDirection) world.getBlockState(blockposition).getValue(BlockBell.FACING);
}
+ // CraftBukkit start
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleBellRingEvent(world, blockposition, enumdirection, entity)) {
+ return false;
+ }
+ // CraftBukkit end
((TileEntityBell) tileentity).onHit(enumdirection);
world.playSound((EntityHuman) null, blockposition, SoundEffects.BELL_BLOCK, SoundCategory.BLOCKS, 2.0F, 1.0F);

37
paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityBell.patch Normal file
View File

@@ -0,0 +1,37 @@
--- a/net/minecraft/world/level/block/entity/TileEntityBell.java
+++ b/net/minecraft/world/level/block/entity/TileEntityBell.java
@@ -35,8 +35,8 @@
public boolean shaking;
public EnumDirection clickDirection;
private List<EntityLiving> nearbyEntities;
- private boolean resonating;
- private int resonationTicks;
+ public boolean resonating;
+ public int resonationTicks;
public TileEntityBell(BlockPosition blockposition, IBlockData iblockdata) {
super(TileEntityTypes.BELL, blockposition, iblockdata);
@@ -120,7 +120,7 @@
EntityLiving entityliving = (EntityLiving) iterator.next();
if (entityliving.isAlive() && !entityliving.isRemoved() && blockposition.closerToCenterThan(entityliving.position(), 32.0D)) {
- entityliving.getBrain().setMemory(MemoryModuleType.HEARD_BELL_TIME, (Object) this.level.getGameTime());
+ entityliving.getBrain().setMemory(MemoryModuleType.HEARD_BELL_TIME, this.level.getGameTime()); // CraftBukkit - decompile error
}
}
}
@@ -144,9 +144,13 @@
}
private static void makeRaidersGlow(World world, BlockPosition blockposition, List<EntityLiving> list) {
+ List<org.bukkit.entity.LivingEntity> entities = // CraftBukkit
list.stream().filter((entityliving) -> {
return isRaiderWithinRange(blockposition, entityliving);
- }).forEach(TileEntityBell::glow);
+ }).map((entity) -> (org.bukkit.entity.LivingEntity) entity.getBukkitEntity()).collect(java.util.stream.Collectors.toCollection(java.util.ArrayList::new)); // CraftBukkit
+
+ org.bukkit.craftbukkit.event.CraftEventFactory.handleBellResonateEvent(world, blockposition, entities).forEach(TileEntityBell::glow);
+ // CraftBukkit end
}
private static void showBellParticles(World world, BlockPosition blockposition, List<EntityLiving> list) {