Mirrors/FastAsyncWorldEdit
3
0
Fork 1
Mirror von https://github.com/IntellectualSites/FastAsyncWorldEdit.git synchronisiert 2024-11-20 01:40:06 +01:00
Code Issues Projekte Releases Wiki Aktivität

fix: remove synchronisation on chunk GET when sending packet

Quellcode durchsuchen
Dieser Commit ist enthalten in:
dordsor21 2024-07-02 18:51:11 +01:00
Ursprung 15c6027958
Commit a14bb7ed2c
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 1E53E88969FFCF0B
5 geänderte Dateien mit 72 neuen und 92 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

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

@ -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
Datei anzeigen

@ -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
Datei anzeigen

@ -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
Datei anzeigen

@ -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
Datei anzeigen

@ -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));
}); });