OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-30 16:19:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Introduce beacon activation/deactivation events

Browse source
This commit is contained in:
Spyridon Pagkalos 2021-03-25 20:28:04 +02:00
parent 73239b4aa7
commit 639cb2d6aa
1 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
paper-server/patches/sources/net/minecraft/world/level/block/entity/BeaconBlockEntity.java.patch
View file

@ -56,7 +56,7 @@
@Nullable @Nullable
static Holder<MobEffect> filterEffect(@Nullable Holder<MobEffect> effect) { static Holder<MobEffect> filterEffect(@Nullable Holder<MobEffect> effect) {
return BeaconBlockEntity.VALID_EFFECTS.contains(effect) ? effect : null; return BeaconBlockEntity.VALID_EFFECTS.contains(effect) ? effect : null;
@@ -186,7 +221,7 @@ @@ -186,10 +221,19 @@
} }
if (blockEntity.levels > 0 && !blockEntity.beamSections.isEmpty()) { if (blockEntity.levels > 0 && !blockEntity.beamSections.isEmpty()) {
@ -65,7 +65,27 @@
BeaconBlockEntity.playSound(world, pos, SoundEvents.BEACON_AMBIENT); BeaconBlockEntity.playSound(world, pos, SoundEvents.BEACON_AMBIENT);
} }
} }
@@ -251,39 +286,96 @@ + // Paper start - beacon activation/deactivation events
+ if (i1 <= 0 && blockEntity.levels > 0) {
+ org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(world, pos);
+ new io.papermc.paper.event.block.BeaconActivatedEvent(block).callEvent();
+ } else if (i1 > 0 && blockEntity.levels <= 0) {
+ org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(world, pos);
+ new io.papermc.paper.event.block.BeaconDeactivatedEvent(block).callEvent();
+ }
+ // Paper end - beacon activation/deactivation events
if (blockEntity.lastCheckY >= l) {
blockEntity.lastCheckY = world.getMinY() - 1;
@@ -247,43 +291,104 @@
@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
BeaconBlockEntity.playSound(this.level, this.worldPosition, SoundEvents.BEACON_DEACTIVATE);
super.setRemoved(); super.setRemoved();
} }
@ -177,7 +197,7 @@
public static void playSound(Level world, BlockPos pos, SoundEvent sound) { public static void playSound(Level world, BlockPos pos, SoundEvent sound) {
world.playSound((Player) null, pos, sound, SoundSource.BLOCKS, 1.0F, 1.0F); world.playSound((Player) null, pos, sound, SoundSource.BLOCKS, 1.0F, 1.0F);
} }
@@ -316,7 +408,7 @@ @@ -316,7 +421,7 @@
if (nbt.contains(key, 8)) { if (nbt.contains(key, 8)) {
ResourceLocation minecraftkey = ResourceLocation.tryParse(nbt.getString(key)); ResourceLocation minecraftkey = ResourceLocation.tryParse(nbt.getString(key));
@ -186,7 +206,7 @@
} else { } else {
return null; return null;
} }
@@ -327,11 +419,13 @@ @@ -327,11 +432,13 @@
super.loadAdditional(nbt, registries); super.loadAdditional(nbt, registries);
this.primaryPower = BeaconBlockEntity.loadEffect(nbt, "primary_effect"); this.primaryPower = BeaconBlockEntity.loadEffect(nbt, "primary_effect");
this.secondaryPower = BeaconBlockEntity.loadEffect(nbt, "secondary_effect"); this.secondaryPower = BeaconBlockEntity.loadEffect(nbt, "secondary_effect");
@ -200,7 +220,7 @@
} }
@Override @Override
@@ -345,6 +439,7 @@ @@ -345,6 +452,7 @@
} }
this.lockKey.addToTag(nbt, registries); this.lockKey.addToTag(nbt, registries);