xjboss/KCauldronX
3
0
Fork 1
Code Releases Activity

remove chunkManager

Browse Source
This commit is contained in:
聪聪
2017-07-31 23:30:07 +08:00
parent c4ade5b285
commit 6f42a00406
8 changed files with 95 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minecraftforge/cauldron/CauldronHooks.java
View File

@@ -353,7 +353,7 @@ public class CauldronHooks
writer.name("name").value(world.getWorld().getName());
writer.name("dimensionId").value(world.provider.dimensionId);
writer.name("players").value(world.playerEntities.size());
writer.name("loadedChunks").value(world.theChunkProviderServer.chunkManager.size());
writer.name("loadedChunks").value(world.theChunkProviderServer.getLoadedChunkCount());
writer.name("activeChunks").value(world.activeChunkSet.size());
writer.name("entities").value(world.loadedEntityList.size());
writer.name("tiles").value(world.loadedTileEntityList.size());

2
src/main/java/net/minecraftforge/cauldron/command/CauldronCommand.java
View File

@@ -110,7 +110,7 @@ public class CauldronCommand extends Command
for (net.minecraft.world.WorldServer world : MinecraftServer.getServer().worlds)
{
sender.sendMessage(ChatColor.GOLD + "Dimension: " + ChatColor.GRAY + world.provider.dimensionId +
ChatColor.GOLD + " Loaded Chunks: " + ChatColor.GRAY + world.theChunkProviderServer.chunkManager.size() +
ChatColor.GOLD + " Loaded Chunks: " + ChatColor.GRAY + world.theChunkProviderServer.getLoadedChunkCount() +
ChatColor.GOLD + " Active Chunks: " + ChatColor.GRAY + world.activeChunkSet.size() +
ChatColor.GOLD + " Entities: " + ChatColor.GRAY + world.loadedEntityList.size() +
ChatColor.GOLD + " Tile Entities: " + ChatColor.GRAY + world.loadedTileEntityList.size()

56
src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View File

@@ -112,6 +112,7 @@ import cc.capture.type.CaptureTree;
import cpw.mods.fml.common.registry.EntityRegistry; // Cauldron
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.IEntityLivingData;
import net.minecraft.world.ChunkCoordIntPair;
import net.minecraftforge.common.util.BlockSnapshot;
public class CraftWorld implements World {
@@ -194,18 +195,12 @@ public class CraftWorld implements World {
}
public Chunk[] getLoadedChunks() {
// KCauldron start
final kcauldron.ChunkManager chunkManager = world.theChunkProviderServer.chunkManager;
final org.bukkit.Chunk[] craftChunks = new CraftChunk[chunkManager.size()];
chunkManager.forEach(new cern.colt.function.ObjectProcedure() {
int i = 0;
@Override
public boolean apply(Object arg) {
craftChunks[i++] = ((net.minecraft.world.chunk.Chunk) arg).bukkitChunk;
return true;
}
});
// KCauldron end
List tLoadedChunk = world.theChunkProviderServer.loadedChunks;
final org.bukkit.Chunk[] craftChunks = new CraftChunk[tLoadedChunk.size()];
int i = 0;
for(Object sObj : tLoadedChunk){
craftChunks[i++]=((net.minecraft.world.chunk.Chunk) sObj).bukkitChunk;
}
return craftChunks;
}
@@ -322,7 +317,7 @@ public class CraftWorld implements World {
}
world.theChunkProviderServer.chunksToUnload.remove(x, z);
net.minecraft.world.chunk.Chunk chunk = world.theChunkProviderServer.chunkManager.getChunk(x, z);
net.minecraft.world.chunk.Chunk chunk = world.theChunkProviderServer.getChunkIfLoaded(x,z);
if (chunk == null) {
world.timings.syncChunkLoadTimer.startTiming(); // Spigot
@@ -336,7 +331,7 @@ public class CraftWorld implements World {
private void chunkLoadPostProcess(net.minecraft.world.chunk.Chunk chunk, int x, int z) {
if (chunk != null) {
world.theChunkProviderServer.chunkManager.putChunk(chunk, x, z); // KCauldron
world.theChunkProviderServer.loadedChunkHashMap.add(ChunkCoordIntPair.chunkXZ2Int(x, z),chunk);
world.theChunkProviderServer.loadedChunks.add(chunk); // Cauldron - vanilla compatibility
chunk.onChunkLoad();
@@ -1450,25 +1445,22 @@ public class CraftWorld implements World {
}
final net.minecraft.world.gen.ChunkProviderServer cps = world.theChunkProviderServer;
cps.chunkManager.forEach(new cern.colt.function.ObjectProcedure() {
@Override
public boolean apply(Object arg) {
net.minecraft.world.chunk.Chunk chunk = (net.minecraft.world.chunk.Chunk) arg;
// If in use, skip it
if (isChunkInUse(chunk.xPosition, chunk.zPosition)) {
return true;
}
// Already unloading?
if (cps.chunksToUnload.contains(chunk.xPosition, chunk.zPosition)) {
return true;
}
// Add unload request
cps.unloadChunksIfNotNearSpawn(chunk.xPosition, chunk.zPosition);
return true;
List tLoadedChunk = world.theChunkProviderServer.loadedChunks;
for(Object sObj : tLoadedChunk){
net.minecraft.world.chunk.Chunk chunk = (net.minecraft.world.chunk.Chunk)sObj;
// If in use, skip it
if (isChunkInUse(chunk.xPosition, chunk.zPosition)) {
continue;
}
});
// Already unloading?
if (cps.chunksToUnload.contains(chunk.xPosition, chunk.zPosition)) {
continue;
}
// Add unload request
cps.unloadChunksIfNotNearSpawn(chunk.xPosition, chunk.zPosition);
}
}
// Spigot start

4
src/main/java/org/spigotmc/WatchdogThread.java
View File

@@ -89,7 +89,7 @@ public class WatchdogThread extends Thread
{
log.log(Level.SEVERE, " Dimension:" + world.provider.dimensionId);
log.log(Level.SEVERE,
" Loaded Chunks: " + world.theChunkProviderServer.chunkManager.size() + " Active Chunks: " + world.activeChunkSet.size()
" Loaded Chunks: " + world.theChunkProviderServer.getLoadedChunkCount() + " Active Chunks: " + world.activeChunkSet.size()
+ " Entities: " + world.loadedEntityList.size() + " Tile Entities: " + world.loadedTileEntityList.size());
log.log(Level.SEVERE, " Entities Last Tick: " + world.entitiesTicked);
log.log(Level.SEVERE, " Tiles Last Tick: " + world.tilesTicked);
@@ -153,7 +153,7 @@ public class WatchdogThread extends Thread
for (net.minecraft.world.WorldServer world : MinecraftServer.getServer().worlds)
{
log.log(Level.WARNING, " Dimension:" + world.provider.dimensionId);
log.log(Level.WARNING, " Loaded Chunks: " + world.theChunkProviderServer.chunkManager.size() +
log.log(Level.WARNING, " Loaded Chunks: " + world.theChunkProviderServer.getLoadedChunkCount() +
" Active Chunks: " + world.activeChunkSet.size() +
" Entities: " + world.loadedEntityList.size() +
" Tile Entities: " + world.loadedTileEntityList.size());