SteamWar/FightSystem
SteamWar/FightSystem
Archiviert
13
1
Fork 0
Code Issues 6 Pull-Requests Releases Wiki Aktivität

Merge pull request 'Waterremover improvements' (#225) from improveWaterremover into master

Quellcode durchsuchen 
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
Dieser Commit ist enthalten in:
Lixfel 2021-01-02 13:16:38 +01:00
Commit 61668b7292
1 geänderte Dateien mit 16 neuen und 31 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

47
FightSystem_Main/src/de/steamwar/fightsystem/utils/WaterRemover.java
Datei anzeigen

@ -20,7 +20,7 @@
package de.steamwar.fightsystem.utils;
import de.steamwar.core.Core;
import org.bukkit.Material;
import de.steamwar.fightsystem.Config;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
@ -29,49 +29,34 @@ import java.util.List;
public class WaterRemover {
private WaterRemover(){}
private static final int MIN_Y = Config.AlignWater ? Config.TeamBlueCornerY + Config.WaterDepth : Config.TeamBlueCornerY;
public static void add(List<Block> l) {
for(Block b : l){
//b cannot be water or air due to current explosion
int startX = b.getX();
int startY = b.getY();
int startZ = b.getZ();
try{
checkBlock(b.getRelative(BlockFace.EAST), startX, startY, startZ);
checkBlock(b.getRelative(BlockFace.WEST), startX, startY, startZ);
checkBlock(b.getRelative(BlockFace.NORTH), startX, startY, startZ);
checkBlock(b.getRelative(BlockFace.SOUTH), startX, startY, startZ);
checkBlock(b.getRelative(BlockFace.UP), startX, startY, startZ);
}catch(IsAnOcean e){
//ignore
}
checkBlock(b.getRelative(BlockFace.UP));
checkBlock(b.getRelative(BlockFace.EAST));
checkBlock(b.getRelative(BlockFace.WEST));
checkBlock(b.getRelative(BlockFace.NORTH));
checkBlock(b.getRelative(BlockFace.SOUTH));
}
}
private static void checkBlock(Block b, int startX, int startY, int startZ) throws IsAnOcean {
private static void checkBlock(Block b) {
if(!removeWater(b))
return;
// If distance to original block is greater than 20
if(Math.abs(startX - b.getX()) + Math.abs(startY - b.getY() + Math.abs(startZ - b.getZ())) >= 20){
b.setType(Material.WATER);
throw new IsAnOcean();
}
if(b.getY() < MIN_Y)
return;
try{
checkBlock(b.getRelative(BlockFace.EAST), startX, startY, startZ);
checkBlock(b.getRelative(BlockFace.WEST), startX, startY, startZ);
checkBlock(b.getRelative(BlockFace.NORTH), startX, startY, startZ);
checkBlock(b.getRelative(BlockFace.SOUTH), startX, startY, startZ);
checkBlock(b.getRelative(BlockFace.UP), startX, startY, startZ);
}catch(IsAnOcean e){
b.setType(Material.WATER);
throw e;
}
checkBlock(b.getRelative(BlockFace.UP));
checkBlock(b.getRelative(BlockFace.EAST));
checkBlock(b.getRelative(BlockFace.WEST));
checkBlock(b.getRelative(BlockFace.NORTH));
checkBlock(b.getRelative(BlockFace.SOUTH));
}
private static class IsAnOcean extends Throwable{}
public static boolean isWater(Block block){
switch(Core.getVersion()){
case 8: