Tianpao/Arclight
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update upstream

Browse Source
This commit is contained in:
IzzelAliz 2021-10-30 16:39:05 +08:00
parent 8c102f1eeb
commit 858f92acb2
No known key found for this signature in database
GPG Key ID: EE50E123A11D8338
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftEventFactoryMixin.java
View File

@ -16,6 +16,7 @@ import org.bukkit.Bukkit;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.craftbukkit.v.block.CraftBlock; import org.bukkit.craftbukkit.v.block.CraftBlock;
import org.bukkit.craftbukkit.v.block.CraftBlockState; import org.bukkit.craftbukkit.v.block.CraftBlockState;
import org.bukkit.craftbukkit.v.block.CraftBlockStates;
import org.bukkit.craftbukkit.v.block.data.CraftBlockData; import org.bukkit.craftbukkit.v.block.data.CraftBlockData;
import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.craftbukkit.v.event.CraftEventFactory;
import org.bukkit.craftbukkit.v.util.CraftMagicNumbers; import org.bukkit.craftbukkit.v.util.CraftMagicNumbers;
@ -95,7 +96,7 @@ public class CraftEventFactoryMixin {
return true; return true;
} }
CraftBlockState state = CraftBlockState.getBlockState(world, target, flag); CraftBlockState state = CraftBlockStates.getBlockState(world, target, flag);
state.setData(block); state.setData(block);
BlockSpreadEvent event = new BlockSpreadEvent(state.getBlock(), CraftBlock.at(world, source), state); BlockSpreadEvent event = new BlockSpreadEvent(state.getBlock(), CraftBlock.at(world, source), state);
@ -143,7 +144,7 @@ public class CraftEventFactoryMixin {
world.setBlock(pos, block, flag); world.setBlock(pos, block, flag);
return true; return true;
} }
CraftBlockState blockState = CraftBlockState.getBlockState(world, pos, flag); CraftBlockState blockState = CraftBlockStates.getBlockState(world, pos, flag);
blockState.setData(block); blockState.setData(block);
BlockFormEvent event = (entity == null) ? new BlockFormEvent(blockState.getBlock(), blockState) : new EntityBlockFormEvent(((EntityBridge) entity).bridge$getBukkitEntity(), blockState.getBlock(), blockState); BlockFormEvent event = (entity == null) ? new BlockFormEvent(blockState.getBlock(), blockState) : new EntityBlockFormEvent(((EntityBridge) entity).bridge$getBukkitEntity(), blockState.getBlock(), blockState);
@ -164,9 +165,9 @@ public class CraftEventFactoryMixin {
public static BlockFadeEvent callBlockFadeEvent(LevelAccessor world, BlockPos pos, net.minecraft.world.level.block.state.BlockState newBlock) { public static BlockFadeEvent callBlockFadeEvent(LevelAccessor world, BlockPos pos, net.minecraft.world.level.block.state.BlockState newBlock) {
// Suppress during worldgen // Suppress during worldgen
if (!(world instanceof Level) || !DistValidate.isValid(world)) { if (!(world instanceof Level) || !DistValidate.isValid(world)) {
return new BlockFadeEvent(CraftBlock.at(world, pos), new CraftBlockState(CraftMagicNumbers.getMaterial(newBlock.getBlock()))); return new BlockFadeEvent(CraftBlock.at(world, pos), CraftBlockStates.getBlockState(CraftMagicNumbers.getMaterial(newBlock.getBlock()), null));
} }
CraftBlockState state = CraftBlockState.getBlockState(world, pos); CraftBlockState state = CraftBlockStates.getBlockState(world, pos);
state.setData(newBlock); state.setData(newBlock);
BlockFadeEvent event = new BlockFadeEvent(state.getBlock(), state); BlockFadeEvent event = new BlockFadeEvent(state.getBlock(), state);