Upstream
/
Greenhouses
mirror of https://github.com/BentoBoxWorld/Greenhouses.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed snowing. BoundingBox coords wrong. 

https://github.com/BentoBoxWorld/Greenhouses/issues/27
This commit is contained in:
tastybento 2019-10-13 16:17:20 -07:00
parent 30c693c6e0
commit 460e012b62
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/world/bentobox/greenhouses/listeners/SnowTracker.java
View File

@ -39,22 +39,25 @@ public class SnowTracker implements Listener {
} }
private void getAirBlocks(Greenhouse gh) { private boolean getAirBlocks(Greenhouse gh) {
boolean createdSnow = false;
List<Block> waterBlocks = new ArrayList<>(); List<Block> waterBlocks = new ArrayList<>();
for (int x = (int)gh.getBoundingBox().getMinX() + 1; x < (int)gh.getBoundingBox().getMaxX(); x++) { for (int x = (int)gh.getBoundingBox().getMinX() + 1; x < (int)gh.getBoundingBox().getMaxX(); x++) {
for (int z = (int)gh.getBoundingBox().getMinY() + 1; z < (int)gh.getBoundingBox().getMaxY(); z++) { for (int z = (int)gh.getBoundingBox().getMinZ() + 1; z < (int)gh.getBoundingBox().getMaxZ(); z++) {
for (int y = gh.getCeilingHeight() - 1; y >= gh.getFloorHeight(); y--) { for (int y = (int)gh.getBoundingBox().getMaxY() - 2; y >= (int)gh.getBoundingBox().getMinY(); y--) {
Block b = gh.getLocation().getWorld().getBlockAt(x, y, z); Block b = gh.getLocation().getWorld().getBlockAt(x, y, z);
if (b.getType().equals(Material.AIR) || b.getType().equals(Material.SNOW)) { Material type = b.getType();
if (type.equals(Material.AIR) || type.equals(Material.SNOW)) {
b.getWorld().spawnParticle(Particle.SNOWBALL, b.getLocation(), 5); b.getWorld().spawnParticle(Particle.SNOWBALL, b.getLocation(), 5);
} else { } else {
// Add snow // Add snow
if (b.getType().equals(Material.WATER)) { if (type.equals(Material.WATER)) {
waterBlocks.add(b); waterBlocks.add(b);
} else { } else {
// Not water // Not water
if (Math.random() < addon.getSettings().getSnowDensity() && !b.isLiquid()) { if (Math.random() < addon.getSettings().getSnowDensity() && !b.isLiquid()) {
b.getRelative(BlockFace.UP).setType(Material.SNOW); b.getRelative(BlockFace.UP).setType(Material.SNOW);
createdSnow = true;
} }
} }
@ -68,6 +71,7 @@ public class SnowTracker implements Listener {
if (maxSize > 0) { if (maxSize > 0) {
waterBlocks.stream().limit(maxSize).filter(b -> Math.random() < addon.getSettings().getSnowDensity()).forEach(b -> b.setType(Material.ICE)); waterBlocks.stream().limit(maxSize).filter(b -> Math.random() < addon.getSettings().getSnowDensity()).forEach(b -> b.setType(Material.ICE));
} }
return createdSnow;
} }
@EventHandler @EventHandler
@ -85,11 +89,12 @@ public class SnowTracker implements Listener {
} }
private void removeWaterBucketAndShake(Greenhouse g) { private void removeWaterBucketAndShake(Greenhouse g) {
Hopper h = ((Hopper)g.getRoofHopperLocation().getBlock().getState());
h.getInventory().removeItem(new ItemStack(Material.WATER_BUCKET));
h.getInventory().addItem(new ItemStack(Material.BUCKET));
// Scatter snow // Scatter snow
getAirBlocks(g); if (getAirBlocks(g)) {
Hopper h = ((Hopper)g.getRoofHopperLocation().getBlock().getState());
h.getInventory().removeItem(new ItemStack(Material.WATER_BUCKET));
h.getInventory().addItem(new ItemStack(Material.BUCKET));
}
} }
private void shakeGlobes(World world) { private void shakeGlobes(World world) {