Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chunk Compression on seperate thread. Thanks to Zeerix.

Browse Source
This commit is contained in:
Rigby
2011-07-26 17:03:52 +01:00
committed by EvilSeph
parent 85805e53a3
commit 6ae23e3f03
5 changed files with 149 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/net/minecraft/server/EntityPlayer.java
View File

@@ -7,6 +7,7 @@ import java.util.Set;
// CraftBukkit start
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.ChunkCompressionThread;
import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.event.entity.EntityDeathEvent;
@@ -209,7 +210,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
if (chunkcoordintpair != null) {
boolean flag1 = false;
if (this.netServerHandler.b() < 4) {
if (this.netServerHandler.b() + ChunkCompressionThread.getPlayerQueueSize(this) < 4) { // CraftBukkit - Add check against Chunk Packets in the ChunkCompressionThread.
flag1 = true;
}

5
src/main/java/net/minecraft/server/NetServerHandler.java
View File

@@ -7,6 +7,7 @@ import java.util.logging.Logger;
// CraftBukkit start
import org.bukkit.ChatColor;
import org.bukkit.craftbukkit.ChunkCompressionThread;
import org.bukkit.craftbukkit.command.ColouredConsoleSender;
import org.bukkit.Location;
import org.bukkit.command.CommandException;
@@ -629,6 +630,10 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
this.networkManager.queue(new Packet3Chat(line));
}
packet = null;
} else if (packet.k == true) {
// Reroute all low-priority packets through to compression thread.
ChunkCompressionThread.sendPacket(this.player, packet);
packet = null;
}
if (packet != null) this.networkManager.queue(packet);
// CraftBukkit end

7
src/main/java/net/minecraft/server/Packet51MapChunk.java
View File

@@ -16,7 +16,8 @@ public class Packet51MapChunk extends Packet {
public int e;
public int f;
public byte[] g;
private int h;
public int h; // CraftBukkit - private -> public
public byte[] rawData; // CraftBukkit
public Packet51MapChunk() {
this.k = true;
@@ -36,6 +37,7 @@ public class Packet51MapChunk extends Packet {
this.d = l;
this.e = i1;
this.f = j1;
/* CraftBukkit - Moved compression into its own method.
byte[] abyte = data; // CraftBukkit - uses data from above constructor
Deflater deflater = new Deflater(-1);
@@ -46,7 +48,8 @@ public class Packet51MapChunk extends Packet {
this.h = deflater.deflate(this.g);
} finally {
deflater.end();
}
}*/
this.rawData = data; // CraftBukkit
}
public void a(DataInputStream datainputstream) throws IOException { // CraftBukkit - throws IOEXception