icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into player_controller

Browse Source
This commit is contained in:
gnembon committed 2019-07-10 18:27:45 -03:00
2 parents 3aa6c1d925 24609a8694
commit 1835fa9d25
1 file changed
+3 -1
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/carpet/mixins/ServerPlayerInteractionManager_scarpetEventsMixin.java
+3 -1
View File
@@ -1,7 +1,9 @@
package carpet.mixins; package carpet.mixins;
import carpet.CarpetServer; import carpet.CarpetServer;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.network.ServerPlayerInteractionManager; import net.minecraft.server.network.ServerPlayerInteractionManager;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
@@ -22,7 +24,7 @@ public class ServerPlayerInteractionManager_scarpetEventsMixin
target = "Lnet/minecraft/block/Block;onBroken(Lnet/minecraft/world/IWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)V", target = "Lnet/minecraft/block/Block;onBroken(Lnet/minecraft/world/IWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)V",
shift = At.Shift.BEFORE shift = At.Shift.BEFORE
)) ))
private void onBlockBroken(BlockPos blockPos_1, CallbackInfoReturnable<Boolean> cir, BlockState blockState_1, boolean boolean_1) private void onBlockBroken(BlockPos blockPos_1, CallbackInfoReturnable<Boolean> cir, BlockState blockState_1, BlockEntity be, Block b, boolean boolean_1)
{ {
CarpetServer.scriptServer.events.onBlockBroken(player, blockPos_1, blockState_1); CarpetServer.scriptServer.events.onBlockBroken(player, blockPos_1, blockState_1);
} }