unwaterlog blocks on water ro (#160)

bruh
This commit is contained in:
super 2019-11-29 11:35:03 -05:00 committed by Ivan
parent a79b26f4be
commit 43b4fc89ef

View File

@ -11,6 +11,8 @@ import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.data.BlockData;
import org.bukkit.block.data.Waterlogged;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -141,11 +143,19 @@ public class Command_ro extends FreedomCommand
for (int zOffset = -radius; zOffset <= radius; zOffset++) for (int zOffset = -radius; zOffset <= radius; zOffset++)
{ {
Block block = centerBlock.getRelative(xOffset, yOffset, zOffset); Block block = centerBlock.getRelative(xOffset, yOffset, zOffset);
BlockData data = block.getBlockData();
if (block.getType().equals(fromMaterial)) if (block.getType().equals(fromMaterial) || data instanceof Waterlogged)
{ {
Waterlogged waterloggedData = (Waterlogged) data;
if (block.getLocation().distanceSquared(center) < (radius * radius)) if (block.getLocation().distanceSquared(center) < (radius * radius))
{ {
if (fromMaterial.equals(Material.WATER))
{
waterloggedData.setWaterlogged(false);
block.setBlockData(waterloggedData);
affected++;
continue;
}
block.setType(toMaterial); block.setType(toMaterial);
affected++; affected++;
} }