mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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 7afde8f75f
commit ffb572ce9a
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
49 changed files with 153 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Spigot-API-Patches/0038-Add-EntityZapEvent.patch
View file

@ -1,4 +1,4 @@
From c6760f719794bea15aefbc716b386ea7bc3a7af7 Mon Sep 17 00:00:00 2001
From 2b3054eda2cfa7dd47f019fa1d1eda5537c73266 Mon Sep 17 00:00:00 2001
From: AlphaBlend <whizkid3000@hotmail.com>
Date: Sun, 16 Oct 2016 23:19:34 -0700
Subject: [PATCH] Add EntityZapEvent
@ -6,7 +6,7 @@ Subject: [PATCH] Add EntityZapEvent
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java
new file mode 100644
index 0000000..0da8944
index 00000000..0da89441
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java
@@ -0,0 +1,63 @@
@ -74,7 +74,7 @@ index 0000000..0da8944
+ }
+}
diff --git a/src/main/java/org/bukkit/event/entity/PigZapEvent.java b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
index aa80ebf..73844b8 100644
index aa80ebf1..73844b8f 100644
--- a/src/main/java/org/bukkit/event/entity/PigZapEvent.java
+++ b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
@@ -1,5 +1,6 @@
@ -119,5 +119,5 @@ index aa80ebf..73844b8 100644
+ // Paper end
}
--
2.9.3
2.12.2