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

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
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

6
Spigot-API-Patches/0036-EntityRegainHealthEvent-isFastRegen-API.patch
View file

@ -1,11 +1,11 @@
From b8f719bf3e633e806374b39efb137bdadcf487aa Mon Sep 17 00:00:00 2001
From 7d6cfc99f472097c25b7b7a2ea575724d7edaa5c Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Fri, 22 Apr 2016 01:43:11 -0500
Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
diff --git a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
index c7e9ba6..3ffc727 100644
index c7e9ba6f..3ffc7273 100644
--- a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
@@ -13,12 +13,31 @@ public class EntityRegainHealthEvent extends EntityEvent implements Cancellable
@ -41,5 +41,5 @@ index c7e9ba6..3ffc727 100644
/**
* Gets the amount of regained health
--
2.9.3
2.12.2