Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-31 12:31:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into acquirable

Browse Source
This commit is contained in:
TheMode 2021-04-23 17:52:41 +02:00
commit 02ceed0563
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minestom/server/instance/Chunk.java
View File

@ -592,6 +592,8 @@ public abstract class Chunk implements Viewable, Tickable, DataContainer {
*/ */
protected void unload() { protected void unload() {
this.loaded = false; this.loaded = false;
ChunkDataPacket.CACHE.invalidate(getIdentifier());
UpdateLightPacket.CACHE.invalidate(getIdentifier());
} }
/** /**

2
src/main/java/net/minestom/server/network/packet/server/play/ChunkDataPacket.java
View File

@ -33,7 +33,7 @@ import java.util.concurrent.TimeUnit;
public class ChunkDataPacket implements ServerPacket, CacheablePacket { public class ChunkDataPacket implements ServerPacket, CacheablePacket {
private static final BlockManager BLOCK_MANAGER = MinecraftServer.getBlockManager(); private static final BlockManager BLOCK_MANAGER = MinecraftServer.getBlockManager();
private static final TemporaryPacketCache CACHE = new TemporaryPacketCache(5, TimeUnit.MINUTES); public static final TemporaryPacketCache CACHE = new TemporaryPacketCache(5, TimeUnit.MINUTES);
public boolean fullChunk; public boolean fullChunk;
public Biome[] biomes; public Biome[] biomes;

2
src/main/java/net/minestom/server/network/packet/server/play/UpdateLightPacket.java
View File

@ -16,7 +16,7 @@ import java.util.concurrent.TimeUnit;
public class UpdateLightPacket implements ServerPacket, CacheablePacket { public class UpdateLightPacket implements ServerPacket, CacheablePacket {
private static final TemporaryPacketCache CACHE = new TemporaryPacketCache(5, TimeUnit.MINUTES); public static final TemporaryPacketCache CACHE = new TemporaryPacketCache(5, TimeUnit.MINUTES);
public int chunkX; public int chunkX;
public int chunkZ; public int chunkZ;

3
src/main/java/net/minestom/server/network/player/NettyPlayerConnection.java
View File

@ -61,7 +61,6 @@ public class NettyPlayerConnection extends PlayerConnection {
private UUID bungeeUuid; private UUID bungeeUuid;
private PlayerSkin bungeeSkin; private PlayerSkin bungeeSkin;
private final static int INITIAL_BUFFER_SIZE = 65_535; // 2^16-1
private final Object tickBufferLock = new Object(); private final Object tickBufferLock = new Object();
private volatile ByteBuf tickBuffer = BufUtils.getBuffer(true); private volatile ByteBuf tickBuffer = BufUtils.getBuffer(true);
@ -69,8 +68,6 @@ public class NettyPlayerConnection extends PlayerConnection {
super(); super();
this.channel = channel; this.channel = channel;
this.remoteAddress = channel.remoteAddress(); this.remoteAddress = channel.remoteAddress();
this.tickBuffer.ensureWritable(INITIAL_BUFFER_SIZE);
} }
/** /**

4
src/main/java/net/minestom/server/utils/cache/TemporaryCache.java vendored
View File

@ -41,6 +41,10 @@ public class TemporaryCache<T> {
this.cache.put(identifier, value); this.cache.put(identifier, value);
} }
public void invalidate(@NotNull UUID identifier) {
this.cache.invalidate(identifier);
}
/** /**
* Retrieves an object from cache. * Retrieves an object from cache.
* *