Brandon/FastAsyncWorldedit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only instantiate packets for the required versions

Browse Source
This commit is contained in:
Jesse Boyd 2016-12-15 18:32:19 +11:00
parent 1b07dbae1d
commit bde4749e2c
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
1 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
bukkit/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitQueue17.java
View File

@ -275,45 +275,49 @@ public class BukkitQueue17 extends BukkitQueue_0<Chunk, ChunkSection[], ChunkSec
return;
}
// Send chunks
int version = -1;
PacketPlayOutMapChunk packet = null;
Map<Integer, PacketPlayOutMapChunk> packets = null;
int mask = fc.getBitMask();
if (mask == 0 || mask == 65535 && hasEntities(nmsChunk)) {
PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, false, 65280, 5);
HashMap<Integer, PacketPlayOutMapChunk> customPackets = null;
for (EntityPlayer player : players) {
int version = player.playerConnection.networkManager.getVersion();
if (version != 5) {
if (customPackets == null) {
customPackets = new HashMap<>();
int currentVersion = player.playerConnection.networkManager.getVersion();
if (currentVersion != version) {
if (packet != null) {
if (packets == null) {
packets = new HashMap<>();
}
packets.put(version, packet);
packet = packets.get(currentVersion);
}
PacketPlayOutMapChunk customPacket = customPackets.get(version);
if (customPacket == null) {
customPacket = new PacketPlayOutMapChunk(nmsChunk, false, 65280, version);
customPackets.put(version, customPacket);
version = currentVersion;
if (packet == null) {
packet = new PacketPlayOutMapChunk(nmsChunk, false, 65280, version);
}
player.playerConnection.sendPacket(customPacket);
} else {
player.playerConnection.sendPacket(packet);
}
}
mask = 255;
}
PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, false, mask, 5);
HashMap<Integer, PacketPlayOutMapChunk> customPackets = null;
for (EntityPlayer player : players) {
int version = player.playerConnection.networkManager.getVersion();
if (version != 5) {
if (customPackets == null) {
customPackets = new HashMap<>();
}
PacketPlayOutMapChunk customPacket = customPackets.get(version);
if (customPacket == null) {
customPacket = new PacketPlayOutMapChunk(nmsChunk, false, mask, version);
customPackets.put(version, customPacket);
}
player.playerConnection.sendPacket(customPacket);
} else {
player.playerConnection.sendPacket(packet);
}
mask = 255;
version = -1;
packet = null;
packets = null;
}
for (EntityPlayer player : players) {
int currentVersion = player.playerConnection.networkManager.getVersion();
if (currentVersion != version) {
if (packet != null) {
if (packets == null) {
packets = new HashMap<>();
}
packets.put(version, packet);
packet = packets.get(currentVersion);
}
version = currentVersion;
if (packet == null) {
packet = new PacketPlayOutMapChunk(nmsChunk, false, mask, version);
}
}
player.playerConnection.sendPacket(packet);
}
} catch (Throwable e) {
MainUtil.handleError(e);