mirror of
https://github.com/PaperMC/Paper.git
synced 2024-06-25 06:14:50 +02:00
e792da723a
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 30885166 Update to Minecraft 1.16.4 CraftBukkit Changes: 3af81c71 Update to Minecraft 1.16.4 Spigot Changes: f011ca24 Update to Minecraft 1.16.4 Co-authored-by: Mariell Hoversholm <proximyst@proximyst.com>
60 lines
2.7 KiB
Diff
60 lines
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Spottedleaf <spottedleaf@spottedleaf.dev>
|
|
Date: Mon, 6 Apr 2020 17:39:25 -0700
|
|
Subject: [PATCH] Reduce memory footprint of NBTTagCompound
|
|
|
|
Fastutil maps are going to have a lower memory footprint - which
|
|
is important because we clone chunk data after reading it for safety.
|
|
So, reduce the impact of the clone on GC.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
|
|
index 9c445902e6adc05773497bc4444203ca364e4f5c..8dd91ddf9e1489ec035452c590cbd59afa44c18f 100644
|
|
--- a/src/main/java/net/minecraft/server/NBTTagCompound.java
|
|
+++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
|
|
@@ -20,6 +20,7 @@ import java.util.Set;
|
|
import java.util.UUID;
|
|
import java.util.regex.Pattern;
|
|
import javax.annotation.Nullable;
|
|
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; // Paper
|
|
import org.apache.logging.log4j.LogManager;
|
|
import org.apache.logging.log4j.Logger;
|
|
|
|
@@ -41,7 +42,7 @@ public class NBTTagCompound implements NBTBase {
|
|
if (i > 512) {
|
|
throw new RuntimeException("Tried to read NBT tag with too high complexity, depth > 512");
|
|
} else {
|
|
- HashMap hashmap = Maps.newHashMap();
|
|
+ Object2ObjectOpenHashMap<String, NBTBase> hashmap = new Object2ObjectOpenHashMap<>(8, 0.8f); // Paper - reduce memory footprint of NBTTagCompound
|
|
|
|
byte b0;
|
|
|
|
@@ -77,7 +78,7 @@ public class NBTTagCompound implements NBTBase {
|
|
}
|
|
|
|
public NBTTagCompound() {
|
|
- this(Maps.newHashMap());
|
|
+ this(new Object2ObjectOpenHashMap<>(8, 0.8f)); // Paper - reduce memory footprint of NBTTagCompound
|
|
}
|
|
|
|
@Override
|
|
@@ -409,9 +410,17 @@ public class NBTTagCompound implements NBTBase {
|
|
|
|
@Override
|
|
public NBTTagCompound clone() {
|
|
- Map<String, NBTBase> map = Maps.newHashMap(Maps.transformValues(this.map, NBTBase::clone));
|
|
+ // Paper start - reduce memory footprint of NBTTagCompound
|
|
+ Object2ObjectOpenHashMap<String, NBTBase> ret = new Object2ObjectOpenHashMap<>(this.map.size(), 0.8f);
|
|
|
|
- return new NBTTagCompound(map);
|
|
+ Iterator<Map.Entry<String, NBTBase>> iterator = (this.map instanceof Object2ObjectOpenHashMap) ? ((Object2ObjectOpenHashMap)this.map).object2ObjectEntrySet().fastIterator() : this.map.entrySet().iterator();
|
|
+ while (iterator.hasNext()) {
|
|
+ Map.Entry<String, NBTBase> entry = iterator.next();
|
|
+ ret.put(entry.getKey(), entry.getValue().clone());
|
|
+ }
|
|
+
|
|
+ return new NBTTagCompound(ret);
|
|
+ // Paper end - reduce memory footprint of NBTTagCompound
|
|
}
|
|
|
|
public boolean equals(Object object) {
|