EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-26 15:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Remove unneccessary code.

Browse Source
This commit is contained in:
t00thpick1 2017-04-14 23:34:31 -04:00
parent 133281faaa
commit c9c2c483fa
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/PrimitiveChunkStore.java
View File

@ -7,7 +7,6 @@ import java.util.UUID;
import org.bukkit.World; import org.bukkit.World;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.blockmeta.ChunkletStore; import com.gmail.nossr50.util.blockmeta.ChunkletStore;
public class PrimitiveChunkStore implements ChunkStore { public class PrimitiveChunkStore implements ChunkStore {
@ -20,14 +19,12 @@ public class PrimitiveChunkStore implements ChunkStore {
private int cx; private int cx;
private int cz; private int cz;
private UUID worldUid; private UUID worldUid;
transient private int worldHeight;
public PrimitiveChunkStore(World world, int cx, int cz) { public PrimitiveChunkStore(World world, int cx, int cz) {
this.cx = cx; this.cx = cx;
this.cz = cz; this.cz = cz;
this.worldUid = world.getUID(); this.worldUid = world.getUID();
this.worldHeight = world.getMaxHeight(); this.store = new boolean[16][16][world.getMaxHeight()];
this.store = new boolean[16][16][this.worldHeight];
} }
@Override @Override
@ -71,7 +68,7 @@ public class PrimitiveChunkStore implements ChunkStore {
public boolean isEmpty() { public boolean isEmpty() {
for (int x = 0; x < 16; x++) { for (int x = 0; x < 16; x++) {
for (int z = 0; z < 16; z++) { for (int z = 0; z < 16; z++) {
for (int y = 0; y < this.worldHeight; y++) { for (int y = 0; y < store.length; y++) {
if (store[x][z][y]) { if (store[x][z][y]) {
return false; return false;
} }
@ -85,7 +82,7 @@ public class PrimitiveChunkStore implements ChunkStore {
public void copyFrom(ChunkletStore otherStore) { public void copyFrom(ChunkletStore otherStore) {
for (int x = 0; x < 16; x++) { for (int x = 0; x < 16; x++) {
for (int z = 0; z < 16; z++) { for (int z = 0; z < 16; z++) {
for (int y = 0; y < this.worldHeight; y++) { for (int y = 0; y < store.length; y++) {
store[x][z][y] = otherStore.isTrue(x, y, z); store[x][z][y] = otherStore.isTrue(x, y, z);
} }
} }
@ -121,11 +118,6 @@ public class PrimitiveChunkStore implements ChunkStore {
cx = in.readInt(); cx = in.readInt();
cz = in.readInt(); cz = in.readInt();
// Constructor is not invoked, need to set these fields
World world = mcMMO.p.getServer().getWorld(this.worldUid);
this.worldHeight = world.getMaxHeight();
store = (boolean[][][]) in.readObject(); store = (boolean[][][]) in.readObject();
if (fileVersionNumber < 5) { if (fileVersionNumber < 5) {
@ -136,10 +128,10 @@ public class PrimitiveChunkStore implements ChunkStore {
private void fixArray() { private void fixArray() {
boolean[][][] temp = this.store; boolean[][][] temp = this.store;
this.store = new boolean[16][16][this.worldHeight]; this.store = new boolean[16][16][temp.length];
for (int x = 0; x < 16; x++) { for (int x = 0; x < 16; x++) {
for (int z = 0; z < 16; z++) { for (int z = 0; z < 16; z++) {
for (int y = 0; y < this.worldHeight; y++) { for (int y = 0; y < temp.length; y++) {
try { try {
store[x][z][y] = temp[x][y][z]; store[x][z][y] = temp[x][y][z];
} }