Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-30 14:13:38 +01:00
Code Issues Projects Releases Wiki Activity

Propagate stateByID scaling performance improvement

Browse Source
This commit is contained in:
Mike Primm 2021-03-14 12:08:07 -05:00
parent aef7a16b1c
commit 0809d23559
14 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fabric-1.15.2/src/main/java/org/dynmap/fabric_1_15_2/DynmapPlugin.java
View File

@ -179,7 +179,7 @@ public class DynmapPlugin {
int idx = bsids.getId(bs); int idx = bsids.getId(bs);
if (idx >= stateByID.length) { if (idx >= stateByID.length) {
int plen = stateByID.length; int plen = stateByID.length;
stateByID = Arrays.copyOf(stateByID, idx + 1); stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%
Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR); Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR);
} }
Block b = bs.getBlock(); Block b = bs.getBlock();

2
fabric-1.16.1/src/main/java/org/dynmap/fabric_1_16_1/DynmapPlugin.java
View File

@ -177,7 +177,7 @@ public class DynmapPlugin {
int idx = bsids.getId(bs); int idx = bsids.getId(bs);
if (idx >= stateByID.length) { if (idx >= stateByID.length) {
int plen = stateByID.length; int plen = stateByID.length;
stateByID = Arrays.copyOf(stateByID, idx + 1); stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%
Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR); Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR);
} }
Block b = bs.getBlock(); Block b = bs.getBlock();

2
fabric-1.16.2/src/main/java/org/dynmap/fabric_1_16_2/DynmapPlugin.java
View File

@ -177,7 +177,7 @@ public class DynmapPlugin {
int idx = bsids.getRawId(bs); int idx = bsids.getRawId(bs);
if (idx >= stateByID.length) { if (idx >= stateByID.length) {
int plen = stateByID.length; int plen = stateByID.length;
stateByID = Arrays.copyOf(stateByID, idx + 1); stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%
Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR); Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR);
} }
Block b = bs.getBlock(); Block b = bs.getBlock();

2
fabric-1.16.4/src/main/java/org/dynmap/fabric_1_16_4/DynmapPlugin.java
View File

@ -177,7 +177,7 @@ public class DynmapPlugin {
int idx = bsids.getRawId(bs); int idx = bsids.getRawId(bs);
if (idx >= stateByID.length) { if (idx >= stateByID.length) {
int plen = stateByID.length; int plen = stateByID.length;
stateByID = Arrays.copyOf(stateByID, idx + 1); stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%
Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR); Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR);
} }
Block b = bs.getBlock(); Block b = bs.getBlock();

2
forge-1.11.2/src/main/java/org/dynmap/forge_1_11_2/DynmapPlugin.java
View File

@ -177,7 +177,7 @@ public class DynmapPlugin
int i = Block.getIdFromBlock(b); int i = Block.getIdFromBlock(b);
if (i >= (stateByID.length >> 4)) { if (i >= (stateByID.length >> 4)) {
int plen = stateByID.length; int plen = stateByID.length;
stateByID = Arrays.copyOf(stateByID, (i+1) << 4); stateByID = Arrays.copyOf(stateByID, i*11/10); // grow array by 10%
Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR); Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR);
} }
ResourceLocation ui = null; ResourceLocation ui = null;

2
forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/DynmapPlugin.java
View File

@ -178,7 +178,7 @@ public class DynmapPlugin
int i = Block.getIdFromBlock(b); int i = Block.getIdFromBlock(b);
if (i >= (stateByID.length >> 4)) { if (i >= (stateByID.length >> 4)) {
int plen = stateByID.length; int plen = stateByID.length;
stateByID = Arrays.copyOf(stateByID, (i+1) << 4); stateByID = Arrays.copyOf(stateByID, i*11/10); // grow array by 10%
Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR); Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR);
} }
ResourceLocation ui = null; ResourceLocation ui = null;

2
forge-1.13.2/src/main/java/org/dynmap/forge_1_13_2/DynmapPlugin.java
View File

@ -201,7 +201,7 @@ public class DynmapPlugin
int idx = bsids.get(bs); int idx = bsids.get(bs);
if (idx >= stateByID.length) { if (idx >= stateByID.length) {
int plen = stateByID.length; int plen = stateByID.length;
stateByID = Arrays.copyOf(stateByID, idx+1); stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%
Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR); Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR);
} }
Block b = bs.getBlock(); Block b = bs.getBlock();

2
forge-1.14.4/src/main/java/org/dynmap/forge_1_14_4/DynmapPlugin.java
View File

@ -227,7 +227,7 @@ public class DynmapPlugin
int idx = bsids.get(bs); int idx = bsids.get(bs);
if (idx >= stateByID.length) { if (idx >= stateByID.length) {
int plen = stateByID.length; int plen = stateByID.length;
stateByID = Arrays.copyOf(stateByID, idx+1); stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%
Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR); Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR);
} }
Block b = bs.getBlock(); Block b = bs.getBlock();

2
forge-1.15.2/src/main/java/org/dynmap/forge_1_15_2/DynmapPlugin.java
View File

@ -228,7 +228,7 @@ public class DynmapPlugin
int idx = bsids.get(bs); int idx = bsids.get(bs);
if (idx >= stateByID.length) { if (idx >= stateByID.length) {
int plen = stateByID.length; int plen = stateByID.length;
stateByID = Arrays.copyOf(stateByID, idx+1); stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%
Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR); Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR);
} }
Block b = bs.getBlock(); Block b = bs.getBlock();

2
forge-1.16.1/src/main/java/org/dynmap/forge_1_16_1/DynmapPlugin.java
View File

@ -229,7 +229,7 @@ public class DynmapPlugin
int idx = bsids.get(bs); int idx = bsids.get(bs);
if (idx >= stateByID.length) { if (idx >= stateByID.length) {
int plen = stateByID.length; int plen = stateByID.length;
stateByID = Arrays.copyOf(stateByID, idx+1); stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%
Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR); Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR);
} }
Block b = bs.getBlock(); Block b = bs.getBlock();

2
forge-1.16.2/src/main/java/org/dynmap/forge_1_16_2/DynmapPlugin.java
View File

@ -239,7 +239,7 @@ public class DynmapPlugin
int idx = bsids.getId(bs); int idx = bsids.getId(bs);
if (idx >= stateByID.length) { if (idx >= stateByID.length) {
int plen = stateByID.length; int plen = stateByID.length;
stateByID = Arrays.copyOf(stateByID, idx+1); stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%
Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR); Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR);
} }
Block b = bs.getBlock(); Block b = bs.getBlock();

2
forge-1.16.3/src/main/java/org/dynmap/forge_1_16_3/DynmapPlugin.java
View File

@ -239,7 +239,7 @@ public class DynmapPlugin
int idx = bsids.getId(bs); int idx = bsids.getId(bs);
if (idx >= stateByID.length) { if (idx >= stateByID.length) {
int plen = stateByID.length; int plen = stateByID.length;
stateByID = Arrays.copyOf(stateByID, idx+1); stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%
Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR); Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR);
} }
Block b = bs.getBlock(); Block b = bs.getBlock();

2
forge-1.16.4/src/main/java/org/dynmap/forge_1_16_4/DynmapPlugin.java
View File

@ -239,7 +239,7 @@ public class DynmapPlugin
int idx = bsids.getId(bs); int idx = bsids.getId(bs);
if (idx >= stateByID.length) { if (idx >= stateByID.length) {
int plen = stateByID.length; int plen = stateByID.length;
stateByID = Arrays.copyOf(stateByID, idx+1); stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%
Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR); Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR);
} }
Block b = bs.getBlock(); Block b = bs.getBlock();

1
forge-1.16.5/src/main/java/org/dynmap/forge_1_16_5/DynmapPlugin.java
View File

@ -240,7 +240,6 @@ public class DynmapPlugin
if (idx >= stateByID.length) { if (idx >= stateByID.length) {
int plen = stateByID.length; int plen = stateByID.length;
stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10% stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%
Log.debug("Resized stateByID from " + plen + " to " + stateByID.length);
Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR); Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR);
} }
Block b = bs.getBlock(); Block b = bs.getBlock();