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

Fixes issue where greenhouse biome was not reverted on breakage 

Also removed greenhouses that no longer have an island.

https://github.com/BentoBoxWorld/Greenhouses/issues/11
This commit is contained in:
tastybento 2019-08-01 13:29:25 -07:00
parent 96936bdc9a
commit 815caa799a
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -51,7 +51,7 @@
<!-- Revision variable removes warning about dynamic version -->
<revision>${build.version}-SNAPSHOT</revision>
<!-- This allows to change between versions and snapshots. -->
<build.version>0.3.1</build.version>
<build.version>0.3.2</build.version>
<build.number>-LOCAL</build.number>
</properties>

19
src/main/java/world/bentobox/greenhouses/managers/GreenhouseManager.java
View File

@ -1,5 +1,7 @@
package world.bentobox.greenhouses.managers;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import org.bukkit.Location;
@ -85,10 +87,13 @@ public class GreenhouseManager implements Listener {
private void loadGreenhouses() {
map.clear();
addon.log("Loading greenhouses...");
List<Greenhouse> toBeRemoved = new ArrayList<>();
handler.loadObjects().forEach(g -> {
GreenhouseResult result = map.addGreenhouse(g);
switch (result) {
case FAIL_NO_ISLAND:
// Delete the failed greenhouse
toBeRemoved.add(g);
case FAIL_OVERLAPPING:
case NULL:
addon.logError(result.name());
@ -102,6 +107,8 @@ public class GreenhouseManager implements Listener {
}
});
addon.log("Loaded " + map.getSize() + " greenhouses.");
// Remove the old or outdated greenhouses
toBeRemoved.forEach(handler::deleteObject);
}
/**
@ -120,12 +127,12 @@ public class GreenhouseManager implements Listener {
handler.deleteObject(g);
map.removeGreenhouse(g);
addon.log("Returning biome to original state: " + g.getOriginalBiome().toString());
if (g.getOriginalBiome().equals(Biome.NETHER) || g.getOriginalBiome().equals(Biome.DESERT)
|| g.getOriginalBiome().equals(Biome.DESERT_HILLS)) {
for (int x = (int)g.getBoundingBox().getMinX(); x<= (int)g.getBoundingBox().getMaxX(); x++) {
for (int z = (int)g.getBoundingBox().getMinZ(); z<= (int)g.getBoundingBox().getMinZ(); z++) {
// Set back to the original biome
g.getLocation().getWorld().setBiome(x, z, g.getOriginalBiome());
for (int x = (int)g.getBoundingBox().getMinX(); x<= (int)g.getBoundingBox().getMaxX(); x++) {
for (int z = (int)g.getBoundingBox().getMinZ(); z<= (int)g.getBoundingBox().getMaxZ(); z++) {
// Set back to the original biome
g.getLocation().getWorld().setBiome(x, z, g.getOriginalBiome());
if (g.getOriginalBiome().equals(Biome.NETHER) || g.getOriginalBiome().equals(Biome.DESERT)
|| g.getOriginalBiome().equals(Biome.DESERT_HILLS)) {
for (int y = g.getFloorHeight(); y< g.getCeilingHeight(); y++) {
Block b = g.getLocation().getWorld().getBlockAt(x, y, z);
// Remove any water