Clean up more - still no luck working around load/unload chunk memory

This commit is contained in:
Mike Primm 2019-05-11 21:47:27 -05:00
parent d75116901b
commit ee5ad4ebce

View File

@ -2,41 +2,28 @@ package org.dynmap.bukkit.helper.v114;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.IdentityHashMap; import java.util.IdentityHashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Set;
import org.bukkit.Bukkit;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.ChunkSnapshot; import org.bukkit.ChunkSnapshot;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Server;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.WorldBorder; import org.bukkit.WorldBorder;
import org.dynmap.DynmapChunk; import org.dynmap.DynmapChunk;
import org.dynmap.Log; import org.dynmap.Log;
import org.dynmap.bukkit.helper.BukkitVersionHelper;
import org.dynmap.bukkit.helper.BukkitVersionHelperCB; import org.dynmap.bukkit.helper.BukkitVersionHelperCB;
import org.dynmap.bukkit.helper.BukkitWorld; import org.dynmap.bukkit.helper.BukkitWorld;
import org.dynmap.bukkit.helper.v114.MapChunkCache114; import org.dynmap.bukkit.helper.v114.MapChunkCache114;
import org.dynmap.hdmap.HDBlockModels;
import org.dynmap.renderer.DynmapBlockState; import org.dynmap.renderer.DynmapBlockState;
import org.dynmap.utils.MapChunkCache; import org.dynmap.utils.MapChunkCache;
import org.dynmap.utils.Polygon; import org.dynmap.utils.Polygon;
import org.dynmap.common.BiomeMap;
import net.minecraft.server.v1_14_R1.BiomeBase; import net.minecraft.server.v1_14_R1.BiomeBase;
import net.minecraft.server.v1_14_R1.Block; import net.minecraft.server.v1_14_R1.Block;
import net.minecraft.server.v1_14_R1.BlockFluids; import net.minecraft.server.v1_14_R1.BlockFluids;
import net.minecraft.server.v1_14_R1.BlockLogAbstract; import net.minecraft.server.v1_14_R1.BlockLogAbstract;
import net.minecraft.server.v1_14_R1.IBlockData; import net.minecraft.server.v1_14_R1.IBlockData;
import net.minecraft.server.v1_14_R1.IBlockState;
import net.minecraft.server.v1_14_R1.IRegistry; import net.minecraft.server.v1_14_R1.IRegistry;
import net.minecraft.server.v1_14_R1.Material; import net.minecraft.server.v1_14_R1.Material;
@ -78,13 +65,6 @@ public class BukkitVersionHelperSpigot114 extends BukkitVersionHelperCB {
w.unloadChunk(cx, cz, false); w.unloadChunk(cx, cz, false);
} }
private String stripBlockString(String bname) {
int idx = bname.indexOf('{');
if (idx >= 0) bname = bname.substring(idx+1);
idx = bname.indexOf('}');
if (idx >= 0) bname = bname.substring(0, idx);
return bname;
}
/** /**
* Get block short name list * Get block short name list
*/ */