forked from PaperMC/Paper
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Call BlockRedstoneEvent for more interactions
- Loading branch information
1 parent
0a6e743
commit e27f578
Showing
17 changed files
with
210 additions
and
104 deletions.
There are no files selected for viewing
17 changes: 17 additions & 0 deletions
17
paper-server/patches/sources/net/minecraft/world/level/block/AbstractSkullBlock.java.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| --- a/net/minecraft/world/level/block/AbstractSkullBlock.java | ||
| +++ b/net/minecraft/world/level/block/AbstractSkullBlock.java | ||
| @@ -75,6 +_,14 @@ | ||
| if (!level.isClientSide) { | ||
| boolean hasNeighborSignal = level.hasNeighborSignal(pos); | ||
| if (hasNeighborSignal != state.getValue(POWERED)) { | ||
| + // Paper start - Call BlockRedstoneEvent | ||
| + org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(level, pos); | ||
| + org.bukkit.event.block.BlockRedstoneEvent event = new org.bukkit.event.block.BlockRedstoneEvent(block, state.getValue(POWERED) ? 15 : 0, hasNeighborSignal ? 15 : 0); | ||
| + event.callEvent(); | ||
| + if (hasNeighborSignal == (event.getNewCurrent() <= 0)) { | ||
| + return; | ||
| + } | ||
| + // Paper end - Call BlockRedstoneEvent | ||
| level.setBlock(pos, state.setValue(POWERED, Boolean.valueOf(hasNeighborSignal)), 2); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
paper-server/patches/sources/net/minecraft/world/level/block/BellBlock.java.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
paper-server/patches/sources/net/minecraft/world/level/block/CopperBulbBlock.java.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| --- a/net/minecraft/world/level/block/CopperBulbBlock.java | ||
| +++ b/net/minecraft/world/level/block/CopperBulbBlock.java | ||
| @@ -47,6 +_,14 @@ | ||
| boolean hasNeighborSignal = level.hasNeighborSignal(pos); | ||
| if (hasNeighborSignal != state.getValue(POWERED)) { | ||
| BlockState blockState = state; | ||
| + // Paper start - Call BlockRedstoneEvent | ||
| + org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(level, pos); | ||
| + org.bukkit.event.block.BlockRedstoneEvent event = new org.bukkit.event.block.BlockRedstoneEvent(block, state.getValue(POWERED) ? 15 : 0, hasNeighborSignal ? 15 : 0); | ||
| + event.callEvent(); | ||
| + if (hasNeighborSignal == (event.getNewCurrent() <= 0)) { | ||
| + return; | ||
| + } | ||
| + // Paper end - Call BlockRedstoneEvent | ||
| if (!state.getValue(POWERED)) { | ||
| blockState = state.cycle(LIT); | ||
| level.playSound(null, pos, blockState.getValue(LIT) ? SoundEvents.COPPER_BULB_TURN_ON : SoundEvents.COPPER_BULB_TURN_OFF, SoundSource.BLOCKS); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 26 additions & 11 deletions
37
paper-server/patches/sources/net/minecraft/world/level/block/LightningRodBlock.java.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,36 @@ | ||
| --- a/net/minecraft/world/level/block/LightningRodBlock.java | ||
| +++ b/net/minecraft/world/level/block/LightningRodBlock.java | ||
| @@ -84,6 +_,18 @@ | ||
| @@ -84,6 +_,16 @@ | ||
| } | ||
|
|
||
| public void onLightningStrike(BlockState state, Level level, BlockPos pos) { | ||
| + // CraftBukkit start | ||
| + boolean powered = state.getValue(LightningRodBlock.POWERED); | ||
| + int old = (powered) ? 15 : 0; | ||
| + int current = (!powered) ? 15 : 0; | ||
| + // Paper start - Call BlockRedstoneEvent | ||
| + if (!state.getValue(POWERED)) { | ||
| + org.bukkit.event.block.BlockRedstoneEvent event = new org.bukkit.event.block.BlockRedstoneEvent(org.bukkit.craftbukkit.block.CraftBlock.at(level, pos), 0, 15); | ||
| + event.callEvent(); | ||
| + | ||
| + org.bukkit.event.block.BlockRedstoneEvent eventRedstone = new org.bukkit.event.block.BlockRedstoneEvent(org.bukkit.craftbukkit.block.CraftBlock.at(level, pos), old, current); | ||
| + level.getCraftServer().getPluginManager().callEvent(eventRedstone); | ||
| + | ||
| + if (eventRedstone.getNewCurrent() <= 0) { | ||
| + return; | ||
| + if (event.getNewCurrent() <= 0) { | ||
| + return; | ||
| + } | ||
| + } | ||
| + // CraftBukkit end | ||
| + // Paper end - Call BlockRedstoneEvent | ||
| level.setBlock(pos, state.setValue(POWERED, Boolean.valueOf(true)), 3); | ||
| this.updateNeighbours(state, level, pos); | ||
| level.scheduleTick(pos, this, 8); | ||
| @@ -97,6 +_,16 @@ | ||
|
|
||
| @Override | ||
| protected void tick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) { | ||
| + // Paper start - Call BlockRedstoneEvent | ||
| + if (state.getValue(POWERED)) { | ||
| + org.bukkit.event.block.BlockRedstoneEvent event = new org.bukkit.event.block.BlockRedstoneEvent(org.bukkit.craftbukkit.block.CraftBlock.at(level, pos), 15, 0); | ||
| + event.callEvent(); | ||
| + | ||
| + if (event.getNewCurrent() > 0) { | ||
| + return; | ||
| + } | ||
| + } | ||
| + // Paper end - Call BlockRedstoneEvent | ||
| level.setBlock(pos, state.setValue(POWERED, Boolean.valueOf(false)), 3); | ||
| this.updateNeighbours(state, level, pos); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.