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

fix: remove synchronisation on chunk GET when sending packet

Browse Source
This commit is contained in:
dordsor21 2024-07-02 18:51:11 +01:00
parent 15c6027958
commit a14bb7ed2c
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
5 changed files with 72 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
worldedit-bukkit/adapters/adapter-1_19_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_19_R3/PaperweightPlatformAdapter.java
View File

@ -350,27 +350,23 @@ public final class PaperweightPlatformAdapter extends NMSAdapter {
MinecraftServer.getServer().execute(() -> { MinecraftServer.getServer().execute(() -> {
ClientboundLevelChunkWithLightPacket packet; ClientboundLevelChunkWithLightPacket packet;
if (PaperLib.isPaper()) { if (PaperLib.isPaper()) {
synchronized (chunk) { packet = new ClientboundLevelChunkWithLightPacket(
packet = new ClientboundLevelChunkWithLightPacket( levelChunk,
levelChunk, nmsWorld.getChunkSource().getLightEngine(),
nmsWorld.getChunkSource().getLightEngine(), null,
null, null,
null, true,
true, false // last false is to not bother with x-ray
false // last false is to not bother with x-ray );
);
}
} else { } else {
synchronized (chunk) { // deprecated on paper - deprecation suppressed
// deprecated on paper - deprecation suppressed packet = new ClientboundLevelChunkWithLightPacket(
packet = new ClientboundLevelChunkWithLightPacket( levelChunk,
levelChunk, nmsWorld.getChunkSource().getLightEngine(),
nmsWorld.getChunkSource().getLightEngine(), null,
null, null,
null, true
true );
);
}
} }
nearbyPlayers(nmsWorld, coordIntPair).forEach(p -> p.connection.send(packet)); nearbyPlayers(nmsWorld, coordIntPair).forEach(p -> p.connection.send(packet));
}); });

32
worldedit-bukkit/adapters/adapter-1_20_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2/PaperweightPlatformAdapter.java
View File

@ -364,25 +364,21 @@ public final class PaperweightPlatformAdapter extends NMSAdapter {
MinecraftServer.getServer().execute(() -> { MinecraftServer.getServer().execute(() -> {
ClientboundLevelChunkWithLightPacket packet; ClientboundLevelChunkWithLightPacket packet;
if (PaperLib.isPaper()) { if (PaperLib.isPaper()) {
synchronized (chunk) { packet = new ClientboundLevelChunkWithLightPacket(
packet = new ClientboundLevelChunkWithLightPacket( levelChunk,
levelChunk, nmsWorld.getChunkSource().getLightEngine(),
nmsWorld.getChunkSource().getLightEngine(), null,
null, null,
null, false // last false is to not bother with x-ray
false // last false is to not bother with x-ray );
);
}
} else { } else {
synchronized (chunk) { // deprecated on paper - deprecation suppressed
// deprecated on paper - deprecation suppressed packet = new ClientboundLevelChunkWithLightPacket(
packet = new ClientboundLevelChunkWithLightPacket( levelChunk,
levelChunk, nmsWorld.getChunkSource().getLightEngine(),
nmsWorld.getChunkSource().getLightEngine(), null,
null, null
null );
);
}
} }
nearbyPlayers(nmsWorld, coordIntPair).forEach(p -> p.connection.send(packet)); nearbyPlayers(nmsWorld, coordIntPair).forEach(p -> p.connection.send(packet));
}); });

32
worldedit-bukkit/adapters/adapter-1_20_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R3/PaperweightPlatformAdapter.java
View File

@ -364,25 +364,21 @@ public final class PaperweightPlatformAdapter extends NMSAdapter {
MinecraftServer.getServer().execute(() -> { MinecraftServer.getServer().execute(() -> {
ClientboundLevelChunkWithLightPacket packet; ClientboundLevelChunkWithLightPacket packet;
if (PaperLib.isPaper()) { if (PaperLib.isPaper()) {
synchronized (chunk) { packet = new ClientboundLevelChunkWithLightPacket(
packet = new ClientboundLevelChunkWithLightPacket( levelChunk,
levelChunk, nmsWorld.getChunkSource().getLightEngine(),
nmsWorld.getChunkSource().getLightEngine(), null,
null, null,
null, false // last false is to not bother with x-ray
false // last false is to not bother with x-ray );
);
}
} else { } else {
synchronized (chunk) { // deprecated on paper - deprecation suppressed
// deprecated on paper - deprecation suppressed packet = new ClientboundLevelChunkWithLightPacket(
packet = new ClientboundLevelChunkWithLightPacket( levelChunk,
levelChunk, nmsWorld.getChunkSource().getLightEngine(),
nmsWorld.getChunkSource().getLightEngine(), null,
null, null
null );
);
}
} }
nearbyPlayers(nmsWorld, coordIntPair).forEach(p -> p.connection.send(packet)); nearbyPlayers(nmsWorld, coordIntPair).forEach(p -> p.connection.send(packet));
}); });

32
worldedit-bukkit/adapters/adapter-1_20_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R4/PaperweightPlatformAdapter.java
View File

@ -353,25 +353,21 @@ public final class PaperweightPlatformAdapter extends NMSAdapter {
MinecraftServer.getServer().execute(() -> { MinecraftServer.getServer().execute(() -> {
ClientboundLevelChunkWithLightPacket packet; ClientboundLevelChunkWithLightPacket packet;
if (PaperLib.isPaper()) { if (PaperLib.isPaper()) {
synchronized (chunk) { packet = new ClientboundLevelChunkWithLightPacket(
packet = new ClientboundLevelChunkWithLightPacket( levelChunk,
levelChunk, nmsWorld.getChunkSource().getLightEngine(),
nmsWorld.getChunkSource().getLightEngine(), null,
null, null,
null, false // last false is to not bother with x-ray
false // last false is to not bother with x-ray );
);
}
} else { } else {
synchronized (chunk) { // deprecated on paper - deprecation suppressed
// deprecated on paper - deprecation suppressed packet = new ClientboundLevelChunkWithLightPacket(
packet = new ClientboundLevelChunkWithLightPacket( levelChunk,
levelChunk, nmsWorld.getChunkSource().getLightEngine(),
nmsWorld.getChunkSource().getLightEngine(), null,
null, null
null );
);
}
} }
nearbyPlayers(nmsWorld, coordIntPair).forEach(p -> p.connection.send(packet)); nearbyPlayers(nmsWorld, coordIntPair).forEach(p -> p.connection.send(packet));
}); });

32
worldedit-bukkit/adapters/adapter-1_21/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/PaperweightPlatformAdapter.java
View File

@ -361,25 +361,21 @@ public final class PaperweightPlatformAdapter extends NMSAdapter {
MinecraftServer.getServer().execute(() -> { MinecraftServer.getServer().execute(() -> {
ClientboundLevelChunkWithLightPacket packet; ClientboundLevelChunkWithLightPacket packet;
if (PaperLib.isPaper()) { if (PaperLib.isPaper()) {
synchronized (chunk) { packet = new ClientboundLevelChunkWithLightPacket(
packet = new ClientboundLevelChunkWithLightPacket( levelChunk,
levelChunk, nmsWorld.getChunkSource().getLightEngine(),
nmsWorld.getChunkSource().getLightEngine(), null,
null, null,
null, false // last false is to not bother with x-ray
false // last false is to not bother with x-ray );
);
}
} else { } else {
synchronized (chunk) { // deprecated on paper - deprecation suppressed
// deprecated on paper - deprecation suppressed packet = new ClientboundLevelChunkWithLightPacket(
packet = new ClientboundLevelChunkWithLightPacket( levelChunk,
levelChunk, nmsWorld.getChunkSource().getLightEngine(),
nmsWorld.getChunkSource().getLightEngine(), null,
null, null
null );
);
}
} }
nearbyPlayers(nmsWorld, coordIntPair).forEach(p -> p.connection.send(packet)); nearbyPlayers(nmsWorld, coordIntPair).forEach(p -> p.connection.send(packet));
}); });