OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-10-24 09:56:48 +02:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-1068: Limit the number of patterns on banners

Browse source
This commit is contained in:
Thinkofdeath 2015-07-23 20:50:53 +01:00
parent dc40c528d7
commit 2642f9b344
2 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
nms-patches/TileEntityBanner.patch Normal file
View file

@ -0,0 +1,26 @@
--- a/net/minecraft/server/TileEntityBanner.java
+++ b/net/minecraft/server/TileEntityBanner.java
@@ -20,6 +20,11 @@
if (nbttagcompound.hasKey("Patterns")) {
this.patterns = (NBTTagList) nbttagcompound.getList("Patterns", 10).clone();
+ // CraftBukkit start
+ while (this.patterns.size() > 20) {
+ this.patterns.a(20); // PAIL Rename remove
+ }
+ // CraftBukkit end
}
if (nbttagcompound.hasKeyOfType("Base", 99)) {
@@ -54,6 +59,11 @@
super.a(nbttagcompound);
this.color = nbttagcompound.getInt("Base");
this.patterns = nbttagcompound.getList("Patterns", 10);
+ // CraftBukkit start
+ while (this.patterns.size() > 20) {
+ this.patterns.a(20); // PAIL Rename remove
+ }
+ // CraftBukkit end
this.h = null;
this.i = null;
this.j = null;

4
src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java
View file

@ -50,8 +50,8 @@ public class CraftMetaBanner extends CraftMetaItem implements BannerMeta {
if (entityTag.hasKey(PATTERNS.NBT)) {
NBTTagList patterns = entityTag.getList(PATTERNS.NBT, 10);
for (int i = 0; i < patterns.size(); i++) {
NBTTagCompound p = (NBTTagCompound) patterns.get(i);
for (int i = 0; i < Math.min(patterns.size(), 20); i++) {
NBTTagCompound p = patterns.get(i);
this.patterns.add(new Pattern(DyeColor.getByDyeData((byte) p.getInt(COLOR.NBT)), PatternType.getByIdentifier(p.getString(PATTERN.NBT))));
}
}