From b741bb522d5523f1a01bda869cb9be77a3e70130 Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Wed, 12 Sep 2018 19:32:47 -0500
Subject: [PATCH] Fix redstone in hideores=true

---
 .../main/java/org/dynmap/hdmap/HDBlockModels.java    | 12 ++++++------
 .../org/dynmap/hdmap/HDBlockStateTextureMap.java     |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/DynmapCore/src/main/java/org/dynmap/hdmap/HDBlockModels.java b/DynmapCore/src/main/java/org/dynmap/hdmap/HDBlockModels.java
index 6aba1e97..9e48f1c2 100644
--- a/DynmapCore/src/main/java/org/dynmap/hdmap/HDBlockModels.java
+++ b/DynmapCore/src/main/java/org/dynmap/hdmap/HDBlockModels.java
@@ -84,19 +84,19 @@ public class HDBlockModels {
     private static void remapModel(String bn, String newbn) {
         DynmapBlockState frombs = DynmapBlockState.getBaseStateByName(bn);
         DynmapBlockState tobs = DynmapBlockState.getBaseStateByName(bn);
-        int minstate = Math.min(frombs.getStateCount(),  tobs.getStateCount());
-        for (int bs = 0; bs < minstate; bs++) {
-            DynmapBlockState fb = frombs.getState(bs);
+        int fcnt = frombs.getStateCount();
+        for (int bs = 0; bs < tobs.getStateCount(); bs++) {
             DynmapBlockState tb = tobs.getState(bs);
-            HDBlockModel m = models_by_id_data.get(fb.globalStateIndex);
+            DynmapBlockState fs = tobs.getState(bs % fcnt);
+            HDBlockModel m = models_by_id_data.get(fs.globalStateIndex);
             if (m != null) {
                 models_by_id_data.put(tb.globalStateIndex, m);
             }
             else {
                 models_by_id_data.remove(tb.globalStateIndex);
             }
-            customModelsRequestingTileData.set(tb.globalStateIndex, customModelsRequestingTileData.get(fb.globalStateIndex));
-            changeIgnoredBlocks.set(tb.globalStateIndex, changeIgnoredBlocks.get(fb.globalStateIndex));
+            customModelsRequestingTileData.set(tb.globalStateIndex, customModelsRequestingTileData.get(fs.globalStateIndex));
+            changeIgnoredBlocks.set(tb.globalStateIndex, changeIgnoredBlocks.get(fs.globalStateIndex));
         }
     }        
     
diff --git a/DynmapCore/src/main/java/org/dynmap/hdmap/HDBlockStateTextureMap.java b/DynmapCore/src/main/java/org/dynmap/hdmap/HDBlockStateTextureMap.java
index f154ce32..2b6d98b6 100644
--- a/DynmapCore/src/main/java/org/dynmap/hdmap/HDBlockStateTextureMap.java
+++ b/DynmapCore/src/main/java/org/dynmap/hdmap/HDBlockStateTextureMap.java
@@ -157,10 +157,10 @@ public class HDBlockStateTextureMap {
     public static void remapTexture(String dest, String src) {
         DynmapBlockState dblk = DynmapBlockState.getBaseStateByName(dest);
         DynmapBlockState sblk = DynmapBlockState.getBaseStateByName(src);
-        int mincnt = Math.min(dblk.getStateCount(), sblk.getStateCount());
-        for (int i = 0; i < mincnt; i++) {
+        int scnt = sblk.getStateCount();
+        for (int i = 0; i < dblk.getStateCount(); i++) {
             int didx = dblk.getState(i).globalStateIndex;
-            int sidx = sblk.getState(i).globalStateIndex;
+            int sidx = sblk.getState(i % scnt).globalStateIndex;
             texmaps[didx] = new HDBlockStateTextureMap(texmaps[sidx], null);
         }
     }