Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 09:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ProtocolSupport issue

Browse Source
This commit is contained in:
Jesse Boyd 2019-04-14 00:51:39 +10:00
parent edde2ebe51
commit df8e04cc67
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
1 changed files with 62 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v1_13/BukkitQueue_1_13.java
View File

@ -16,6 +16,7 @@ import com.boydti.fawe.object.visitor.FaweChunkVisitor;
import com.boydti.fawe.util.MainUtil; import com.boydti.fawe.util.MainUtil;
import com.boydti.fawe.util.MathMan; import com.boydti.fawe.util.MathMan;
import com.boydti.fawe.util.ReflectionUtils; import com.boydti.fawe.util.ReflectionUtils;
import com.boydti.fawe.util.TaskManager;
import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.CompoundTag;
import com.sk89q.worldedit.world.biome.BiomeType; import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.block.BlockID; import com.sk89q.worldedit.world.block.BlockID;
@ -65,6 +66,7 @@ import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Map; import java.util.Map;
import java.util.concurrent.atomic.LongAdder; import java.util.concurrent.atomic.LongAdder;
import java.util.function.Supplier;
public class BukkitQueue_1_13 extends BukkitQueue_0<net.minecraft.server.v1_13_R2.Chunk, ChunkSection[], ChunkSection> { public class BukkitQueue_1_13 extends BukkitQueue_0<net.minecraft.server.v1_13_R2.Chunk, ChunkSection[], ChunkSection> {
@ -106,6 +108,9 @@ public class BukkitQueue_1_13 extends BukkitQueue_0<net.minecraft.server.v1_13_R
// protected static final Method methodResize; // protected static final Method methodResize;
protected final static Field fieldDirtyCount;
protected final static Field fieldDirtyBits;
static { static {
try { try {
emptySection = new ChunkSection(0, true); emptySection = new ChunkSection(0, true);
@ -182,6 +187,11 @@ public class BukkitQueue_1_13 extends BukkitQueue_0<net.minecraft.server.v1_13_R
// methodResize = DataPaletteBlock.class.getDeclaredMethod("b", int.class); // methodResize = DataPaletteBlock.class.getDeclaredMethod("b", int.class);
// methodResize.setAccessible(true); // methodResize.setAccessible(true);
fieldDirtyCount = PlayerChunk.class.getDeclaredField("dirtyCount");
fieldDirtyBits = PlayerChunk.class.getDeclaredField("h");
fieldDirtyCount.setAccessible(true);
fieldDirtyBits.setAccessible(true);
Fawe.debug("Using adapter: " + getAdapter()); Fawe.debug("Using adapter: " + getAdapter());
Fawe.debug("========================================="); Fawe.debug("=========================================");
} catch (Throwable e) { } catch (Throwable e) {
@ -672,40 +682,60 @@ public class BukkitQueue_1_13 extends BukkitQueue_0<net.minecraft.server.v1_13_R
if (playerChunk == null) { if (playerChunk == null) {
return false; return false;
} }
if (mask == 0) { if (playerChunk.e()) {
PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, 65535); TaskManager.IMP.sync(new Supplier<Object>() {
for (EntityPlayer player : playerChunk.players) { @Override
player.playerConnection.sendPacket(packet); public Object get() {
} try {
return true; int dirtyBits = fieldDirtyBits.getInt(playerChunk);
} if (mask == 0) dirtyBits |= 65535;
// Send chunks else dirtyBits |= mask;
boolean empty = false;
ChunkSection[] sections = nmsChunk.getSections(); fieldDirtyBits.set(playerChunk, dirtyBits);
for (int i = 0; i < sections.length; i++) { fieldDirtyCount.set(playerChunk, 64);
if (sections[i] == null) { PlayerChunkMap playerManager = ((CraftWorld) getWorld()).getHandle().getPlayerChunkMap();
sections[i] = emptySection; playerManager.a(playerChunk);
empty = true; } catch (IllegalAccessException e) {
} e.printStackTrace();
} }
if (mask == 0 || mask == 65535 && hasEntities(nmsChunk)) { return null;
PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, 65280);
for (EntityPlayer player : playerChunk.players) {
player.playerConnection.sendPacket(packet);
}
mask = 255;
}
PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, mask);
for (EntityPlayer player : playerChunk.players) {
player.playerConnection.sendPacket(packet);
}
if (empty) {
for (int i = 0; i < sections.length; i++) {
if (sections[i] == emptySection) {
sections[i] = null;
} }
} });
} }
// if (mask == 0) {
// PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, 65535);
// for (EntityPlayer player : playerChunk.players) {
// player.playerConnection.sendPacket(packet);
// }
// return true;
// }
// // Send chunks
// boolean empty = false;
// ChunkSection[] sections = nmsChunk.getSections();
// for (int i = 0; i < sections.length; i++) {
// if (sections[i] == null) {
// sections[i] = emptySection;
// empty = true;
// }
// }
// if (mask == 0 || mask == 65535 && hasEntities(nmsChunk)) {
// PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, 65280);
// for (EntityPlayer player : playerChunk.players) {
// player.playerConnection.sendPacket(packet);
// }
// mask = 255;
// }
// PacketPlayOutMapChunk packet = new PacketPlayOutMapChunk(nmsChunk, mask);
// for (EntityPlayer player : playerChunk.players) {
// player.playerConnection.sendPacket(packet);
// }
// if (empty) {
// for (int i = 0; i < sections.length; i++) {
// if (sections[i] == emptySection) {
// sections[i] = null;
// }
// }
// }
return true; return true;
} }