flewkey/flan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stop thrown items activating pressure plate fix #30

Browse Source
This commit is contained in:
Flemmli97 2021-01-21 17:58:44 +01:00
parent 2e087b5d20
commit 92c4e0904e
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/main/java/com/flemmli97/flan/event/BlockInteractEvents.java
View File

@ -109,32 +109,32 @@ public class BlockInteractEvents {
}
public static boolean cancelEntityBlockCollision(BlockState state, World world, BlockPos pos, Entity entity) {
if (entity.world.isClient)
if (world.isClient)
return false;
if (entity instanceof ServerPlayerEntity) {
ClaimPermission perm = BlockToPermissionMap.getFromBlock(state.getBlock());
if (perm == null)
return false;
if (perm != PermissionRegistry.PRESSUREPLATE && perm != PermissionRegistry.PORTAL)
return false;
ClaimStorage storage = ClaimStorage.get((ServerWorld) world);
IPermissionContainer claim = storage.getForPermissionCheck(pos);
if (claim != null)
return !claim.canInteract((ServerPlayerEntity) entity, perm, pos, false);
} else if (entity instanceof ProjectileEntity) {
ClaimPermission perm = BlockToPermissionMap.getFromBlock(state.getBlock());
if (perm == null)
return false;
if (perm != PermissionRegistry.PRESSUREPLATE && perm != PermissionRegistry.BUTTONLEVER)
return false;
ServerPlayerEntity player = null;
if(entity instanceof ServerPlayerEntity)
player = (ServerPlayerEntity) entity;
else if(entity instanceof ProjectileEntity) {
Entity owner = ((ProjectileEntity) entity).getOwner();
if (owner instanceof ServerPlayerEntity) {
ClaimStorage storage = ClaimStorage.get((ServerWorld) world);
IPermissionContainer claim = storage.getForPermissionCheck(pos);
if (claim != null)
return !claim.canInteract((ServerPlayerEntity) owner, perm, pos, false);
}
if(owner instanceof ServerPlayerEntity)
player = (ServerPlayerEntity) owner;
}
else if(entity instanceof ItemEntity) {
Entity owner = ((ServerWorld)world).getEntity(((ItemEntity) entity).getThrower());
if(owner instanceof ServerPlayerEntity)
player = (ServerPlayerEntity) owner;
}
if(player == null)
return false;
ClaimPermission perm = BlockToPermissionMap.getFromBlock(state.getBlock());
if (perm == null)
return false;
if (perm != PermissionRegistry.PRESSUREPLATE && perm != PermissionRegistry.PORTAL)
return false;
ClaimStorage storage = ClaimStorage.get((ServerWorld) world);
IPermissionContainer claim = storage.getForPermissionCheck(pos);
if (claim != null)
return !claim.canInteract(player, perm, pos, false);
return false;
}