Upstream
/
Paper
mirror of https://github.com/PaperMC/Paper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

woops here

This commit is contained in:
Tamion 2024-04-28 14:50:03 +02:00
parent 958d3011d0
commit f600839d4e
No known key found for this signature in database
GPG Key ID: 01E616386DBAE296
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/1046-Add-BlockPlayerSearchEvent.patch
View File

@ -21,7 +21,7 @@ index dd1fe8357ccf084880a7f3d4d9e499bde672c787..e59c3c3c09270c5bf6f41823ca4c8fd4
BeaconBlockEntity.applyEffect(list, primaryEffect, j, b0, true, pos); // Paper - BeaconEffectEvent
diff --git a/src/main/java/net/minecraft/world/level/block/entity/ConduitBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/ConduitBlockEntity.java
index 73e532dc998e5701c1a73da846da3d3a79871b81..ef0b9adad346e5ab9e89f712047d7d7de53a9fe6 100644
index 73e532dc998e5701c1a73da846da3d3a79871b81..fcbcbb6963d168f142cab98b2a549c78b77bad16 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/ConduitBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/ConduitBlockEntity.java
@@ -206,6 +206,11 @@ public class ConduitBlockEntity extends BlockEntity {
@ -29,7 +29,7 @@ index 73e532dc998e5701c1a73da846da3d3a79871b81..ef0b9adad346e5ab9e89f712047d7d7d
AABB axisalignedbb = (new AABB((double) k, (double) l, (double) i1, (double) (k + 1), (double) (l + 1), (double) (i1 + 1))).inflate((double) j).expandTowards(0.0D, (double) world.getHeight(), 0.0D);
List<Player> list1 = world.getEntitiesOfClass(Player.class, axisalignedbb);
+ // Paper start - Add BlockPlayerSearchEvent
+ io.papermc.paper.event.block.BlockPlayerSearchEvent event = new io.papermc.paper.event.block.BlockPlayerSearchEvent(io.papermc.paper.util.MCUtil.toLocation(world, pos).getBlock(), list1.stream().filter(entity -> pos.closerThan(entity.blockPosition(), j) && entity.isInWaterOrRain()).map(player -> (org.bukkit.entity.Player) player.getBukkitEntity()).collect(java.util.stream.Collectors.toList()));
+ io.papermc.paper.event.block.BlockPlayerSearchEvent event = new io.papermc.paper.event.block.BlockPlayerSearchEvent(io.papermc.paper.util.MCUtil.toLocation(world, blockposition).getBlock(), list1.stream().filter(entity -> blockposition.closerThan(entity.blockPosition(), j) && entity.isInWaterOrRain()).map(player -> (org.bukkit.entity.Player) player.getBukkitEntity()).collect(java.util.stream.Collectors.toList()));
+ event.callEvent();
+ list1 = event.getPlayers().stream().map(player -> (Player) ((org.bukkit.craftbukkit.entity.CraftPlayer) player).getHandle()).toList();
+ // Paper end - Add BlockPlayerSearchEvent