diff options
| author | Shane Freeder <[email protected]> | 2017-04-22 15:32:06 +0100 |
|---|---|---|
| committer | Shane Freeder <[email protected]> | 2017-04-22 15:52:56 +0100 |
| commit | ffb572ce9a16b808f2314da669dfa244d11fd29c (patch) | |
| tree | 2e80875f8ed43ff7d3dc7df558c358e830b8505d /Spigot-API-Patches/0036-EntityRegainHealthEvent-isFastRegen-API.patch | |
| parent | 7afde8f75f1af583e7596fe11d5f09c73f3d02b9 (diff) | |
| download | Paper-ffb572ce9a16b808f2314da669dfa244d11fd29c.tar.gz Paper-ffb572ce9a16b808f2314da669dfa244d11fd29c.zip | |
Remove Ignore invalid Marker Icon ID's in maps
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.
Diffstat (limited to 'Spigot-API-Patches/0036-EntityRegainHealthEvent-isFastRegen-API.patch')
| -rw-r--r-- | Spigot-API-Patches/0036-EntityRegainHealthEvent-isFastRegen-API.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Spigot-API-Patches/0036-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-API-Patches/0036-EntityRegainHealthEvent-isFastRegen-API.patch index 0f7c262964..685f10efda 100644 --- a/Spigot-API-Patches/0036-EntityRegainHealthEvent-isFastRegen-API.patch +++ b/Spigot-API-Patches/0036-EntityRegainHealthEvent-isFastRegen-API.patch @@ -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 <[email protected]> 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 |