mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-19 15:09:25 +00:00
236010caba
1. Wet the drys 2. Dry the wets 3. Wet the drys 4. Dry the wets 5. Wet the drys 6. Now dust the wets
100 lines
5.7 KiB
Diff
100 lines
5.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Warrior <50800980+Warriorrrr@users.noreply.github.com>
|
|
Date: Thu, 31 Aug 2023 10:23:06 +0200
|
|
Subject: [PATCH] PaperPR: Fix some beacon event issues
|
|
|
|
Original license: GPLv3
|
|
Original project: https://github.com/PaperMC/Paper
|
|
Paper pull request: https://github.com/PaperMC/Paper/pull/9674
|
|
|
|
Closes Paper#8947
|
|
|
|
Moves the deactivate event call into the onRemove method for the beacon block itself to prevent it from running when the block entity is unloaded. Also fixes an issue where the events were not being called when the beacon beam gets blocked.
|
|
|
|
The field I added feels a bit wrong but it works, it's to prevent the activation event being called immediately after loading, can't see any better way to differentiate between a newly placed beacon and a newly loaded one.
|
|
|
|
diff --git a/net/minecraft/world/level/block/BeaconBlock.java b/net/minecraft/world/level/block/BeaconBlock.java
|
|
index 66eee067b4ffdd72393ca813de995062be5b7a90..38d36a2798b9aa5298ae2936f872fc63d73b7aa2 100644
|
|
--- a/net/minecraft/world/level/block/BeaconBlock.java
|
|
+++ b/net/minecraft/world/level/block/BeaconBlock.java
|
|
@@ -52,4 +52,16 @@ public class BeaconBlock extends BaseEntityBlock implements BeaconBeamBlock {
|
|
|
|
return InteractionResult.SUCCESS;
|
|
}
|
|
+
|
|
+ // Paper start - BeaconDeactivatedEvent
|
|
+ @Override
|
|
+ public void onRemove(BlockState state, Level world, BlockPos pos, BlockState newState, boolean moved) {
|
|
+ if (!state.is(newState.getBlock()) && world.getBlockEntity(pos) instanceof BeaconBlockEntity beacon && beacon.levels > 0 && !beacon.getBeamSections().isEmpty()) {
|
|
+ org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(world, pos);
|
|
+ new io.papermc.paper.event.block.BeaconDeactivatedEvent(block).callEvent();
|
|
+ }
|
|
+
|
|
+ super.onRemove(state, world, pos, newState, moved);
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
diff --git a/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
|
|
index 80b0feac68813f11dc5cadc5faf413a59ad73e5b..2fbbd384113cf62b64c7ff4e805265a09f55ceb0 100644
|
|
--- a/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
|
|
+++ b/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
|
|
@@ -169,6 +169,8 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
|
|
return VALID_EFFECTS.contains(effect) ? effect : null;
|
|
}
|
|
|
|
+ public boolean justLoadedAndPreviouslyActive; // Paper - consider beacon previously active for first tick to skip activate event/sound
|
|
+
|
|
public BeaconBlockEntity(BlockPos pos, BlockState blockState) {
|
|
super(BlockEntityType.BEACON, pos, blockState);
|
|
}
|
|
@@ -234,10 +236,15 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
|
|
}
|
|
}
|
|
// Paper start - beacon activation/deactivation events
|
|
- if (originalLevels <= 0 && blockEntity.levels > 0) {
|
|
+ // Paper start
|
|
+ final boolean prevActive = originalLevels > 0 && (!blockEntity.beamSections.isEmpty() || (blockEntity.justLoadedAndPreviouslyActive && !blockEntity.checkingBeamSections.isEmpty()));
|
|
+ blockEntity.justLoadedAndPreviouslyActive = false;
|
|
+ final boolean newActive = blockEntity.levels > 0 && !blockEntity.checkingBeamSections.isEmpty();
|
|
+ if (!prevActive && newActive) {
|
|
+ // Paper end
|
|
org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(level, pos);
|
|
new io.papermc.paper.event.block.BeaconActivatedEvent(block).callEvent();
|
|
- } else if (originalLevels > 0 && blockEntity.levels <= 0) {
|
|
+ } else if (prevActive && !newActive) { // Paper
|
|
org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(level, pos);
|
|
new io.papermc.paper.event.block.BeaconDeactivatedEvent(block).callEvent();
|
|
}
|
|
@@ -245,10 +252,10 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
|
|
|
|
if (blockEntity.lastCheckY >= height) {
|
|
blockEntity.lastCheckY = level.getMinY() - 1;
|
|
- boolean flag = i > 0;
|
|
+ boolean flag = prevActive; // Paper - Fix MC-183981
|
|
blockEntity.beamSections = blockEntity.checkingBeamSections;
|
|
if (!level.isClientSide) {
|
|
- boolean flag1 = blockEntity.levels > 0;
|
|
+ boolean flag1 = newActive; // Paper - Fix MC-183981
|
|
if (!flag && flag1) {
|
|
playSound(level, pos, SoundEvents.BEACON_ACTIVATE);
|
|
|
|
@@ -292,10 +299,6 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
|
|
|
|
@Override
|
|
public void setRemoved() {
|
|
- // Paper start - beacon activation/deactivation events
|
|
- org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(level, worldPosition);
|
|
- new io.papermc.paper.event.block.BeaconDeactivatedEvent(block).callEvent();
|
|
- // Paper end - beacon activation/deactivation events
|
|
// Paper start - fix MC-153086
|
|
if (this.levels > 0 && !this.beamSections.isEmpty()) {
|
|
playSound(this.level, this.worldPosition, SoundEvents.BEACON_DEACTIVATE);
|
|
@@ -426,6 +429,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
|
|
this.primaryPower = loadEffect(tag, "primary_effect");
|
|
this.secondaryPower = loadEffect(tag, "secondary_effect");
|
|
this.levels = tag.getInt("Levels"); // CraftBukkit - SPIGOT-5053, use where available
|
|
+ this.justLoadedAndPreviouslyActive = this.levels > 0; // Paper
|
|
if (tag.contains("CustomName", 8)) {
|
|
this.name = parseCustomNameSafe(tag.getString("CustomName"), registries);
|
|
}
|