Merge pull request #77 from BentoBoxWorld/develop

Release 2.2.1

Author: tastybento

pom.xml

@@ -61,7 +61,7 @@
         <!-- Do not change unless you want different name for local builds. -->
         <build.number>-LOCAL</build.number>
         <!-- This allows to change between versions. -->
-        <build.version>2.2.0</build.version>
+        <build.version>2.2.1</build.version>
         <!-- SonarCloud -->
         <sonar.projectKey>BentoBoxWorld_SkyGrid</sonar.projectKey>
         <sonar.organization>bentobox-world</sonar.organization>

src/main/java/world/bentobox/skygrid/generators/SkyGridPop.java

@@ -139,38 +139,38 @@ private void alterBlocks(LimitedRegion region, Location loc, Environment environ
     }
 
     private void makeEndPortal(LimitedRegion region, int chunkX, int chunkZ) {
+        int y = addon.getSettings().getEndFrameHeight();
         for (int xx = 1; xx< 6; xx++) {
             for (int zz = 1; zz < 6; zz++) {
                 if (xx == zz || (xx==1 && zz==5) || (xx==5 && zz==1) || (xx>1 && xx<5 && zz>1 && zz<5)) {
                     continue;
                 }
-                setFrame(region, xx + (chunkX << 4), addon.getSettings().getEndFrameHeight(), zz + (chunkZ << 4));
+                int x = xx + (chunkX << 4);
+                int z = zz + (chunkZ << 4);
+                region.setType(x, y, z, Material.END_PORTAL_FRAME);
+                // Cast to end frame
+                EndPortalFrame endFrame = (EndPortalFrame) region.getBlockData(x, y, z);
+
+                // Add the odd eye of ender
+                endFrame.setEye(random.nextDouble() < 0.8);
+                if (zz == 1) {
+                    // Face South
+                    endFrame.setFacing(BlockFace.SOUTH);
+                } else if (zz == 5) {
+                    // Face North
+                    endFrame.setFacing(BlockFace.NORTH);
+                } else if (xx == 1) {
+                    // Face East
+                    endFrame.setFacing(BlockFace.EAST);
+                } else {
+                    // Face West
+                    endFrame.setFacing(BlockFace.WEST);
+                }
+                region.setBlockData(x, y, z, endFrame);
             }
         }
     }
 
-    private void setFrame(LimitedRegion region, int xx, int yy, int zz) {
-        region.setType(xx, yy, zz, Material.END_PORTAL_FRAME);
-        // Cast to end frame
-        EndPortalFrame endFrame = (EndPortalFrame) region.getBlockData(xx, yy, zz);
-
-        // Add the odd eye of ender
-        endFrame.setEye(random.nextDouble() < 0.8);
-        if (zz == 1) {
-            // Face South
-            endFrame.setFacing(BlockFace.SOUTH);
-        } else if (zz == 5) {
-            // Face North
-            endFrame.setFacing(BlockFace.NORTH);
-        } else if (xx == 1) {
-            // Face East
-            endFrame.setFacing(BlockFace.EAST);
-        } else {
-            // Face West
-            endFrame.setFacing(BlockFace.WEST);
-        }
-        region.setBlockData(xx, yy, zz, endFrame);
-    }
 
     private void setSaplingType(LimitedRegion region, Location loc) {
         // Set sapling type if there is one specific to this biome

src/main/resources/config.yml

@@ -1012,7 +1012,7 @@ world:
     BUTTON: 500
     CAKE: 500
     CARTOGRAPHY: 500
-    CHANGE_SETTINGS: 10000
+    CHANGE_SETTINGS: 1000
     CHEST: 500
     CHORUS_FRUIT: 500
     COLLECT_LAVA: 500