Paper/Spigot-Server-Patches/0090-Optimize-Chunk-Access.patch

47 lines
1.8 KiB
Diff
Raw Normal View History

2016-11-17 03:23:38 +01:00
From 77c802f0bbd04aeeb2dece18e0efc00950c987ec Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 27 Aug 2015 01:15:02 -0400
Subject: [PATCH] Optimize Chunk Access
getting a loaded chunk is one of the most hottest pieces of code in the game.
getChunkAt is called for the same chunk multiple times in a row, often from getType();
Optimize this look up by using a Last Access cache.
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
2016-11-17 03:23:38 +01:00
index 54ca738..902f9ac 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
2016-11-17 03:23:38 +01:00
@@ -27,7 +27,27 @@ public class ChunkProviderServer implements IChunkProvider {
2016-06-09 05:57:14 +02:00
public final Set<Long> unloadQueue = Sets.newHashSet();
2016-05-12 04:07:46 +02:00
public final ChunkGenerator chunkGenerator;
private final IChunkLoader chunkLoader;
2016-05-12 04:07:46 +02:00
- public final Long2ObjectMap<Chunk> chunks = new Long2ObjectOpenHashMap(8192);
+ // Paper start
+ protected Chunk lastChunkByPos = null;
2016-05-12 04:07:46 +02:00
+ public Long2ObjectOpenHashMap<Chunk> chunks = new Long2ObjectOpenHashMap<Chunk>(8192) {
+
+ @Override
+ public Chunk get(long key) {
+ if (lastChunkByPos != null && key == lastChunkByPos.chunkKey) {
+ return lastChunkByPos;
+ }
+ return lastChunkByPos = super.get(key);
+ }
+
+ @Override
+ public Chunk remove(long key) {
+ if (lastChunkByPos != null && key == lastChunkByPos.chunkKey) {
+ lastChunkByPos = null;
+ }
+ return super.remove(key);
+ }
+ }; // CraftBukkit
+ // Paper end
public final WorldServer world;
2016-05-12 04:07:46 +02:00
public ChunkProviderServer(WorldServer worldserver, IChunkLoader ichunkloader, ChunkGenerator chunkgenerator) {
--
2016-11-17 03:23:38 +01:00
2.10.2