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

Remove Ignore invalid Marker Icon ID's in maps

Browse Source 
Spigot has patched this issue inside MapIcon, meaning that we no longer need to maintain this patch; Spigots patch also fixes #668 in that it will verify the length of the array, as well as protect against a negative type value being fetched from the array. Only real change is that Spigots patch returns a MapIcon.Type.PLAYER, instead of the RED_MARKER as originally PR'd by Aikar.
This commit is contained in:
Shane Freeder
2017-04-22 15:32:06 +01:00
parent 24f6670a17
commit 4200b785dc
47 changed files with 89 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/Firework-API-s.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Firework API's
diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java
index 572f4dead..f9cf382b2 100644
index 572f4dea..f9cf382b 100644
--- a/src/main/java/net/minecraft/server/EntityFireworks.java
+++ b/src/main/java/net/minecraft/server/EntityFireworks.java
@@ -0,0 +0,0 @@ package net.minecraft.server;
@@ -53,7 +53,7 @@ index 572f4dead..f9cf382b2 100644
public boolean aV() {
diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
index 4fc36d243..5cd68bfaf 100644
index 4fc36d24..5cd68bfa 100644
--- a/src/main/java/net/minecraft/server/ItemFireworks.java
+++ b/src/main/java/net/minecraft/server/ItemFireworks.java
@@ -0,0 +0,0 @@ public class ItemFireworks extends Item {
@@ -73,7 +73,7 @@ index 4fc36d243..5cd68bfaf 100644
if (!entityhuman.abilities.canInstantlyBuild) {
itemstack.subtract(1);
diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
index 2a2f53c82..266741fcd 100644
index 2a2f53c8..266741fc 100644
--- a/src/main/java/net/minecraft/server/NBTTagCompound.java
+++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
@@ -0,0 +0,0 @@ public class NBTTagCompound extends NBTBase {
@@ -86,7 +86,7 @@ index 2a2f53c82..266741fcd 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
index 99746b3c2..d4fbe31d6 100644
index 99746b3c..d4fbe31d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
@@ -0,0 +0,0 @@