Clamp fix for new method

src/engine/InterestManagement/Terrain.java

@@ -21,10 +21,13 @@ import static java.lang.Math.PI;
 public class Terrain {
     public static final HashMap<Integer, short[][]> _heightmap_pixel_cache = new HashMap<>();
     public short[][] terrain_pixel_data;
+
+    public Vector2f image_size = new Vector2f();
     public Vector2f terrain_size = new Vector2f();
     public Vector2f cell_size = new Vector2f();
     public Vector2f cell_count = new Vector2f();
     public float terrain_scale;
+    public Vector2f blend_values = new Vector2f();
     public Vector2f blend_ratio = new Vector2f();
     public int heightmap;
     Zone zone;
@@ -43,6 +46,7 @@ public class Terrain {
         // Load pixel data for this terrain from cache
 
         this.terrain_pixel_data = Terrain._heightmap_pixel_cache.get(heightmap);
+        this.image_size.set(this.terrain_pixel_data.length, this.terrain_pixel_data[0].length);
 
         if (terrain_pixel_data == null)
             Logger.error("Pixel map empty for zone: " + this.zone.getObjectUUID() + ":" + this.zone.zoneName);
@@ -52,8 +56,8 @@ public class Terrain {
         this.terrain_size.x = this.zone.major_radius * 2;
         this.terrain_size.y = this.zone.minor_radius * 2;
 
-        this.cell_count.x = this.terrain_pixel_data.length - 1;
-        this.cell_count.y = this.terrain_pixel_data[0].length - 1;
+        this.cell_count.x = this.image_size.x;
+        this.cell_count.y = this.image_size.y; // Bug in exe
 
         this.cell_size.x = terrain_size.x / this.cell_count.x;
         this.cell_size.y = terrain_size.y / this.cell_count.y;
@@ -62,22 +66,14 @@ public class Terrain {
         // the blending area between child and parent terrains when
         // they are stitched together.
 
-        float max_blend = this.zone.template.max_blend;
-        float min_blend = this.zone.template.min_blend;
+        this.blend_values.x = this.zone.template.max_blend;
+        this.blend_values.y = this.zone.template.min_blend;
 
-        // Zones with a zero blend inherit from their parent terrain
+        Vector2f major_blend = new Vector2f(this.blend_values.x / this.zone.major_radius,
+                this.blend_values.y / this.zone.major_radius);
 
-        if (this.zone.template.max_blend == 0) {
-            Zone parentZone = this.getNextZoneWithTerrain(this.zone.parent);
-            max_blend = parentZone.template.max_blend;
-            min_blend = parentZone.template.min_blend;
-        }
-
-        Vector2f major_blend = new Vector2f(max_blend / this.zone.major_radius,
-                min_blend / this.zone.major_radius);
-
-        Vector2f minor_blend = new Vector2f(max_blend / this.zone.minor_radius,
-                min_blend / this.zone.minor_radius);
+        Vector2f minor_blend = new Vector2f(this.blend_values.x / this.zone.minor_radius,
+                this.blend_values.y / this.zone.minor_radius);
 
         if (major_blend.y > 0.4f)
             blend_ratio.x = major_blend.y;
@@ -91,7 +87,7 @@ public class Terrain {
 
         // Scale coefficient for this terrain
 
-        this.terrain_scale = this.zone.template.terrain_max_y / 255f;
+        this.terrain_scale = this.zone.template.terrain_max_y / 256;
     }
 
     public static Zone getNextZoneWithTerrain(Zone zone) {
@@ -162,14 +158,14 @@ public class Terrain {
 
     public Vector2f getTerrainCell(Vector2f terrain_loc) {
 
-        // Calculate terrain cell with offset
+        // Calculate terrain cell with offset.  Bug mirrors the exe
 
-        Vector2f terrain_cell = new Vector2f(terrain_loc.x / this.cell_size.x, terrain_loc.y / this.cell_size.y);
+        Vector2f terrain_cell = new Vector2f(terrain_loc.x / this.cell_size.x, terrain_loc.y / this.cell_size.x);
 
         // Clamp values when standing directly on pole
 
-        terrain_cell.x = Math.max(0, Math.min(this.cell_count.x - 1, terrain_cell.x));
-        terrain_cell.y = Math.max(0, Math.min(this.cell_count.y - 1, terrain_cell.y));
+        terrain_cell.x = Math.max(0, Math.min(this.cell_count.x - 2, terrain_cell.x));
+        terrain_cell.y = Math.max(0, Math.min(this.cell_count.y - 2, terrain_cell.y));
 
         return terrain_cell;
     }

src/engine/devcmd/cmds/GetHeightCmd.java

@@ -49,19 +49,33 @@ public class GetHeightCmd extends AbstractDevCmd {
 
         float blendedHeight = Terrain.getWorldHeight(currentZone, playerCharacter.getLoc());
 
-        Vector2f gridSquare = heightmapZone.terrain.getTerrainCell(childZoneLoc);
-        gridSquare.x = (float) Math.floor(gridSquare.x);
-        gridSquare.y = (float) Math.floor(gridSquare.y);
+        Vector2f terrainCell = heightmapZone.terrain.getTerrainCell(childZoneLoc);
+        Vector2f cell_offset = new Vector2f(terrainCell.x % 1, terrainCell.y % 1);
+
+        terrainCell.x = (float) Math.floor(terrainCell.x);
+        terrainCell.y = (float) Math.floor(terrainCell.y);
+
+
+        short top_left_pixel = heightmapZone.terrain.terrain_pixel_data[(int) terrainCell.x][(int) terrainCell.y];
+        short top_right_pixel = heightmapZone.terrain.terrain_pixel_data[(int) terrainCell.x + 1][(int) terrainCell.y];
+        short bottom_left_pixel = heightmapZone.terrain.terrain_pixel_data[(int) terrainCell.x][(int) terrainCell.y + 1];
+        short bottom_right_pixel = heightmapZone.terrain.terrain_pixel_data[(int) terrainCell.x + 1][(int) terrainCell.y + 1];
 
         this.throwbackInfo(playerCharacter, "Current Zone : " + currentZone.zoneName);
         this.throwbackInfo(playerCharacter, "Heightmap Zone : " + heightmapZone.zoneName);
         this.throwbackInfo(playerCharacter, "Parent Zone: " + parentZone.zoneName);
 
-        this.throwbackInfo(playerCharacter, "Grid : " + "[" + gridSquare.x + "]" + "[" + gridSquare.y + "]");
-        this.throwbackInfo(playerCharacter, "offset: " + "[" + childZoneOffset.x + "]" + "[" + childZoneOffset.y + "]");
+        this.throwbackInfo(playerCharacter, "Player loc: " + "[" + playerCharacter.loc.x + "]" + "[" + playerCharacter.loc.y + "]" + "[" + playerCharacter.loc.z + "]");
+
+        this.throwbackInfo(playerCharacter, "Terrain Cell : " + "[" + terrainCell.x + "]" + "[" + terrainCell.y + "]");
+        this.throwbackInfo(playerCharacter, "Cell Offset : " + "[" + cell_offset.x + "]" + "[" + cell_offset.y + "]");
+        this.throwbackInfo(playerCharacter, "Pixels : " + "[" + top_left_pixel + "]" + "[" + top_right_pixel + "]");
+        this.throwbackInfo(playerCharacter, "Pixels : " + "[" + bottom_left_pixel + "]" + "[" + bottom_right_pixel + "]");
+
+        this.throwbackInfo(playerCharacter, "Child Zone Offset: " + "[" + childZoneOffset.x + "]" + "[" + childZoneOffset.y + "]");
         this.throwbackInfo(playerCharacter, "Normalized offset: " + "[" + normalizedOffset.x + "]" + "[" + normalizedOffset.y + "]");
-        this.throwbackInfo(playerCharacter, "Heightmap blend Values: max/min" + heightmapZone.template.min_blend + " /" + heightmapZone.template.max_blend);
-        this.throwbackInfo(playerCharacter, "Parent blend Values: nax/min" + parentZone.template.min_blend + " /" + parentZone.template.max_blend);
+        this.throwbackInfo(playerCharacter, "template blend Values: (max/min): " + heightmapZone.template.max_blend + " /" + heightmapZone.template.min_blend);
+        this.throwbackInfo(playerCharacter, "terrain values (max/min): " + heightmapZone.terrain.blend_values.x + " /" + heightmapZone.terrain.blend_values.y);
         this.throwbackInfo(playerCharacter, "Blend coefficient: " + heightmapZone.terrain.getTerrainBlendCoefficient(childZoneOffset));
 
         this.throwbackInfo(playerCharacter, "------------");

src/engine/mobileAI/MobAI.java

@@ -814,8 +814,8 @@ public class MobAI {
                         }
                     }
                 }
-            } else if (System.currentTimeMillis() > (aiAgent.deathTime + (aiAgent.spawnDelay * 1000))) {
-                aiAgent.respawnTime = aiAgent.deathTime + (aiAgent.spawnDelay * 1000);
+            } else if (System.currentTimeMillis() > aiAgent.deathTime + (aiAgent.spawnDelay * 1000L)) {
+                aiAgent.respawnTime = aiAgent.deathTime + (aiAgent.spawnDelay * 1000L);
                 Respawner.respawnQueue.put(aiAgent);
             }
         } catch (Exception e) {