Update to Minecraft 1.20.3

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2023-12-06 03:40:00 +11:00
parent afdb1d9bc3
commit 8398e12b34
256 changed files with 2745 additions and 1911 deletions

View File

@@ -1,18 +1,19 @@
--- a/net/minecraft/server/players/NameReferencingFileConverter.java
+++ b/net/minecraft/server/players/NameReferencingFileConverter.java
@@ -27,6 +27,11 @@
@@ -27,6 +27,12 @@
import net.minecraft.world.level.storage.SavedFile;
import org.slf4j.Logger;
+// CraftBukkit start
+import net.minecraft.nbt.NBTCompressedStreamTools;
+import net.minecraft.nbt.NBTReadLimiter;
+import net.minecraft.nbt.NBTTagCompound;
+// CraftBukkit end
+
public class NameReferencingFileConverter {
static final Logger LOGGER = LogUtils.getLogger();
@@ -87,7 +92,7 @@
@@ -85,7 +91,7 @@
try {
gameprofilebanlist.load();
} catch (IOException ioexception) {
@@ -21,7 +22,7 @@
}
}
@@ -145,7 +150,7 @@
@@ -143,7 +149,7 @@
try {
ipbanlist.load();
} catch (IOException ioexception) {
@@ -30,7 +31,7 @@
}
}
@@ -186,7 +191,7 @@
@@ -184,7 +190,7 @@
try {
oplist.load();
} catch (IOException ioexception) {
@@ -39,7 +40,7 @@
}
}
@@ -230,7 +235,7 @@
@@ -228,7 +234,7 @@
try {
whitelist.load();
} catch (IOException ioexception) {
@@ -48,7 +49,7 @@
}
}
@@ -349,6 +354,30 @@
@@ -347,6 +353,30 @@
File file5 = new File(file, s2 + ".dat");
File file6 = new File(file4, s3 + ".dat");
@@ -56,7 +57,7 @@
+ NBTTagCompound root = null;
+
+ try {
+ root = NBTCompressedStreamTools.readCompressed(new java.io.FileInputStream(file5));
+ root = NBTCompressedStreamTools.readCompressed(new java.io.FileInputStream(file5), NBTReadLimiter.unlimitedHeap());
+ } catch (Exception exception) {
+ exception.printStackTrace();
+ }