Kotori0629/Arclight1.18
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing cactus block damage source, partially address #6

Browse Source
This commit is contained in:
IzzelAliz 2020-05-17 10:05:23 +08:00
parent a58b89b652
commit 09298051a4
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CactusBlockMixin.java
View File

@ -2,12 +2,16 @@ package io.izzel.arclight.mixin.core.block;
import net.minecraft.block.BlockState;
import net.minecraft.block.CactusBlock;
import net.minecraft.entity.Entity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock;
import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(CactusBlock.class)
public class CactusBlockMixin {
@ -16,4 +20,14 @@ public class CactusBlockMixin {
public boolean arclight$blockGrow(World world, BlockPos pos, BlockState state) {
return CraftEventFactory.handleBlockGrowEvent(world, pos, state);
}
@Inject(method = "onEntityCollision", at = @At("HEAD"))
private void arclight$cactusDamage1(BlockState state, World worldIn, BlockPos pos, Entity entityIn, CallbackInfo ci) {
CraftEventFactory.blockDamage = CraftBlock.at(worldIn, pos);
}
@Inject(method = "onEntityCollision", at = @At("RETURN"))
private void arclight$cactusDamage2(BlockState state, World worldIn, BlockPos pos, Entity entityIn, CallbackInfo ci) {
CraftEventFactory.blockDamage = null;
}
}