Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-02 14:38:26 +01:00
Code Issues Projects Releases Wiki Activity

fix: assume viewable storage is only used for play packets

Browse Source 
(cherry picked from commit 9c1781b722)
This commit is contained in:
mworzala 2023-11-29 18:10:34 +02:00 committed by Matt Worzala
parent a0d87f2e91
commit 43baf51d8d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/net/minestom/server/utils/PacketUtils.java
View File

@ -319,14 +319,15 @@ public final class PacketUtils {
private final Int2ObjectMap<LongArrayList> entityIdMap = new Int2ObjectOpenHashMap<>(); private final Int2ObjectMap<LongArrayList> entityIdMap = new Int2ObjectOpenHashMap<>();
private final BinaryBuffer buffer = ObjectPool.BUFFER_POOL.getAndRegister(this); private final BinaryBuffer buffer = ObjectPool.BUFFER_POOL.getAndRegister(this);
private synchronized void append(Viewable viewable, ServerPacket serverPacket, Player player) { private synchronized void append(Viewable viewable, ServerPacket serverPacket, @Nullable Player exception) {
try (var hold = ObjectPool.PACKET_POOL.hold()) { try (var hold = ObjectPool.PACKET_POOL.hold()) {
final ByteBuffer framedPacket = createFramedPacket(player.getPlayerConnection().getServerState(), hold.get(), serverPacket); // Viewable storage is only used for play packets, so fine to assume this.
final ByteBuffer framedPacket = createFramedPacket(ConnectionState.PLAY, hold.get(), serverPacket);
final int packetSize = framedPacket.limit(); final int packetSize = framedPacket.limit();
if (packetSize >= buffer.capacity()) { if (packetSize >= buffer.capacity()) {
process(viewable); process(viewable);
for (Player viewer : viewable.getViewers()) { for (Player viewer : viewable.getViewers()) {
if (!Objects.equals(player, viewer)) { if (!Objects.equals(exception, viewer)) {
writeTo(viewer.getPlayerConnection(), framedPacket, 0, packetSize); writeTo(viewer.getPlayerConnection(), framedPacket, 0, packetSize);
} }
} }
@ -336,9 +337,9 @@ public final class PacketUtils {
final int start = buffer.writerOffset(); final int start = buffer.writerOffset();
this.buffer.write(framedPacket); this.buffer.write(framedPacket);
final int end = buffer.writerOffset(); final int end = buffer.writerOffset();
if (player != null) { if (exception != null) {
final long offsets = (long) start << 32 | end & 0xFFFFFFFFL; final long offsets = (long) start << 32 | end & 0xFFFFFFFFL;
LongList list = entityIdMap.computeIfAbsent(player.getEntityId(), id -> new LongArrayList()); LongList list = entityIdMap.computeIfAbsent(exception.getEntityId(), id -> new LongArrayList());
list.add(offsets); list.add(offsets);
} }
} }