SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update from upstream SpigotMC take 2: Update harder

Browse Source
This commit is contained in:
Zach Brown
2014-12-27 16:07:04 -06:00
parent 4832a37296
commit 105e5e9ba4
5 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CraftBukkit-Patches/0127-Better-item-validation.patch
View File

@@ -67,7 +67,7 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
@@ -0,0 +0,0 @@ import net.minecraft.server.ChatSerializer;
@@ -0,0 +0,0 @@ import net.minecraft.server.IChatBaseComponent;
import net.minecraft.server.NBTTagString;
import org.bukkit.craftbukkit.util.CraftChatMessage;
@@ -96,11 +96,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
// Ignore and treat as an old book
}
}
- pageArray[i] = page;
+ pageArray[i] = limit( page, 2048 ); // Spigot
- addPage(page);
+ addPage( limit( page, 2048 ) ); // Spigot
}
addPage(pageArray);
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java