core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/CraftBukkit-Patches/0072-Catch-stalling-on-corr...

34 lines
1.5 KiB
Diff
Raw Normal View History

Upstream merge.
2015-01-05 03:32:01 +00:00
From 672a4a9a21e9a428fcf80ff56502b438fe505e2e Mon Sep 17 00:00:00 2001
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 20:46:54 +00:00
From: md_5 <git@md-5.net>
Date: Mon, 20 Jan 2014 13:44:07 +1100
Subject: [PATCH] Catch stalling on corrupted map data / NBT arrays.
diff --git a/src/main/java/net/minecraft/server/NBTTagByteArray.java b/src/main/java/net/minecraft/server/NBTTagByteArray.java
Update PaperSpigot to Minecraft 1.8
2014-11-28 01:17:45 +00:00
index 7525469..7a293eb 100644
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 20:46:54 +00:00
--- a/src/main/java/net/minecraft/server/NBTTagByteArray.java
+++ b/src/main/java/net/minecraft/server/NBTTagByteArray.java
Update PaperSpigot to Minecraft 1.8
2014-11-28 01:17:45 +00:00
@@ -21,6 +21,7 @@ public class NBTTagByteArray extends NBTBase {
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 20:46:54 +00:00
Update PaperSpigot to Minecraft 1.8
2014-11-28 01:17:45 +00:00
void load(DataInput datainput, int i, NBTReadLimiter nbtreadlimiter) throws java.io.IOException {
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 20:46:54 +00:00
int j = datainput.readInt();
Update PaperSpigot to Minecraft 1.8
2014-11-28 01:17:45 +00:00
+ com.google.common.base.Preconditions.checkArgument( j < 1 << 24);
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 20:46:54 +00:00
nbtreadlimiter.a((long) (8 * j));
this.data = new byte[j];
diff --git a/src/main/java/net/minecraft/server/NBTTagIntArray.java b/src/main/java/net/minecraft/server/NBTTagIntArray.java
Update PaperSpigot to Minecraft 1.8
2014-11-28 01:17:45 +00:00
index f331ef3..17b0c3d 100644
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 20:46:54 +00:00
--- a/src/main/java/net/minecraft/server/NBTTagIntArray.java
+++ b/src/main/java/net/minecraft/server/NBTTagIntArray.java
@@ -25,6 +25,7 @@ public class NBTTagIntArray extends NBTBase {
Update PaperSpigot to Minecraft 1.8
2014-11-28 01:17:45 +00:00
void load(DataInput datainput, int i, NBTReadLimiter nbtreadlimiter) throws java.io.IOException {
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 20:46:54 +00:00
int j = datainput.readInt();
Update PaperSpigot to Minecraft 1.8
2014-11-28 01:17:45 +00:00
+ com.google.common.base.Preconditions.checkArgument( j < 1 << 24);
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 20:46:54 +00:00
nbtreadlimiter.a((long) (32 * j));
this.data = new int[j];
--
Update PaperSpigot to Minecraft 1.8
2014-11-28 01:17:45 +00:00
2.1.0
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 20:46:54 +00:00