fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent forfeits from breaking blocks they shouldn't break, fixes #190

Browse Source
This commit is contained in:
Electroblob77
2019-09-04 13:21:54 +01:00
parent 06d02ad45d
commit a46bad4497
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/misc/Forfeit.java
+2 -1
View File
@@ -375,7 +375,7 @@ public abstract class Forfeit {
if(!w.isRemote){ if(!w.isRemote){
for(EnumFacing direction : EnumFacing.HORIZONTALS){ for(EnumFacing direction : EnumFacing.HORIZONTALS){
BlockPos pos = p.getPosition().offset(direction); BlockPos pos = p.getPosition().offset(direction);
w.setBlockState(pos, WizardryBlocks.snare.getDefaultState()); if(WizardryUtilities.canBlockBeReplaced(w, pos)) w.setBlockState(pos, WizardryBlocks.snare.getDefaultState());
} }
} }
})); }));
@@ -410,6 +410,7 @@ public abstract class Forfeit {
if(!w.isRemote){ if(!w.isRemote){
List<BlockPos> sphere = WizardryUtilities.getBlockSphere(p.getPosition(), 4); List<BlockPos> sphere = WizardryUtilities.getBlockSphere(p.getPosition(), 4);
sphere.removeIf(pos -> !w.getBlockState(pos).isFullCube()); sphere.removeIf(pos -> !w.getBlockState(pos).isFullCube());
sphere.removeIf(pos -> WizardryUtilities.isBlockUnbreakable(w, pos));
sphere.forEach(pos -> { sphere.forEach(pos -> {
EntityFallingBlock block = new EntityFallingBlock(w, pos.getX() + 0.5, pos.getY() + 0.5, EntityFallingBlock block = new EntityFallingBlock(w, pos.getX() + 0.5, pos.getY() + 0.5,
pos.getZ() + 0.5, w.getBlockState(pos)); pos.getZ() + 0.5, w.getBlockState(pos));