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

6
Spigot-API-Patches/0032-Add-MetadataStoreBase.removeAll-Plugin.patch
View file

@ -1,4 +1,4 @@
From 804562f99c8f2bf6b5d9937d5a7816974c716502 Mon Sep 17 00:00:00 2001
From 1a59075c01dbe0d53bd6fbfd94ccb1ef6a047a6a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 16 Jul 2013 21:26:50 -0400
Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin)
@ -6,7 +6,7 @@ Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin)
So that on reload, metadata will be cleared
diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
index 64c0f0a..6da6abd 100644
index 64c0f0a7..6da6abd8 100644
--- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
+++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
@@ -125,6 +125,26 @@ public abstract class MetadataStoreBase<T> {
@ -37,5 +37,5 @@ index 64c0f0a..6da6abd 100644
* unique data from the subject with a metadataKey.
* <p>
--
2.9.2.windows.1
2.12.2

6
Spigot-API-Patches/0033-Add-PlayerUseUnknownEntityEvent.patch
View file

@ -1,4 +1,4 @@
From b1f22f61664ce8f0ab822528909cce74b2e868db Mon Sep 17 00:00:00 2001
From f63d0416b0cfb04ee48688f93db07c1c439e4c1c Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 2 Apr 2016 05:08:36 -0400
Subject: [PATCH] Add PlayerUseUnknownEntityEvent
@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerUseUnknownEntityEvent
diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java
new file mode 100644
index 0000000..70eeaf5
index 00000000..70eeaf5c
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java
@@ -0,0 +1,42 @@
@ -53,5 +53,5 @@ index 0000000..70eeaf5
+ }
+}
--
2.9.3
2.12.2

6
Spigot-API-Patches/0034-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
View file

@ -1,4 +1,4 @@
From d16e87afdfe9297199c8afd7e3929e734df8a1c4 Mon Sep 17 00:00:00 2001
From 15b47a774783a9db24c742bb1fde6bb7c6404638 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Wed, 13 Apr 2016 20:20:18 -0700
Subject: [PATCH] Add handshake event to allow plugins to handle client
@ -7,7 +7,7 @@ Subject: [PATCH] Add handshake event to allow plugins to handle client
diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java
new file mode 100644
index 0000000..e44d03a
index 00000000..e44d03a2
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java
@@ -0,0 +1,211 @@
@ -223,5 +223,5 @@ index 0000000..e44d03a
+ }
+}
--
2.9.3
2.12.2

6
Spigot-API-Patches/0035-Arrow-pickup-rule-API.patch
View file

@ -1,11 +1,11 @@
From 17223e9ba60ecfb981e037bcc62018b428d71808 Mon Sep 17 00:00:00 2001
From 5f3ad3c3d105730323ea950c36892c1c548f4437 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Fri, 4 Mar 2016 03:13:18 -0500
Subject: [PATCH] Arrow pickup rule API
diff --git a/src/main/java/org/bukkit/entity/Arrow.java b/src/main/java/org/bukkit/entity/Arrow.java
index 1ff0951..da4678d 100644
index 1ff09518..da4678d0 100644
--- a/src/main/java/org/bukkit/entity/Arrow.java
+++ b/src/main/java/org/bukkit/entity/Arrow.java
@@ -72,6 +72,40 @@ public interface Arrow extends Projectile {
@ -50,5 +50,5 @@ index 1ff0951..da4678d 100644
{
--
2.9.3
2.12.2

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

22
Spigot-API-Patches/0037-LootTable-API.patch
View file

@ -1,4 +1,4 @@
From c7f2d65d63f63175db11f06c1fac7c3c3bc5d246 Mon Sep 17 00:00:00 2001
From bc7df9c5fea137834099549bf47b227df1813165 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 1 May 2016 15:19:49 -0400
Subject: [PATCH] LootTable API
@ -12,7 +12,7 @@ Provides methods to determine players looted state for an object
diff --git a/src/main/java/com/destroystokyo/paper/loottable/Lootable.java b/src/main/java/com/destroystokyo/paper/loottable/Lootable.java
new file mode 100644
index 0000000..d962a0c
index 00000000..d962a0ce
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/loottable/Lootable.java
@@ -0,0 +1,78 @@
@ -96,7 +96,7 @@ index 0000000..d962a0c
+}
diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java
new file mode 100644
index 0000000..5e93e7e
index 00000000..5e93e7e3
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java
@@ -0,0 +1,12 @@
@ -114,7 +114,7 @@ index 0000000..5e93e7e
+}
diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java
new file mode 100644
index 0000000..8bebf07
index 00000000..8bebf070
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java
@@ -0,0 +1,12 @@
@ -132,7 +132,7 @@ index 0000000..8bebf07
+}
diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java
new file mode 100644
index 0000000..cde999e
index 00000000..cde999ef
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java
@@ -0,0 +1,111 @@
@ -249,7 +249,7 @@ index 0000000..cde999e
+}
diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java b/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java
new file mode 100644
index 0000000..2169493
index 00000000..2169493d
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java
@@ -0,0 +1,41 @@
@ -295,7 +295,7 @@ index 0000000..2169493
+ }
+}
diff --git a/src/main/java/org/bukkit/block/Chest.java b/src/main/java/org/bukkit/block/Chest.java
index ade09dd..368306d 100644
index ade09ddd..368306d0 100644
--- a/src/main/java/org/bukkit/block/Chest.java
+++ b/src/main/java/org/bukkit/block/Chest.java
@@ -1,13 +1,14 @@
@ -315,7 +315,7 @@ index ade09dd..368306d 100644
/**
* Returns the chest's inventory. If this is a double chest, it returns
diff --git a/src/main/java/org/bukkit/block/Dispenser.java b/src/main/java/org/bukkit/block/Dispenser.java
index 39ee9b0..236ffa3 100644
index 39ee9b04..236ffa32 100644
--- a/src/main/java/org/bukkit/block/Dispenser.java
+++ b/src/main/java/org/bukkit/block/Dispenser.java
@@ -1,13 +1,14 @@
@ -335,7 +335,7 @@ index 39ee9b0..236ffa3 100644
/**
* Gets the BlockProjectileSource object for this dispenser.
diff --git a/src/main/java/org/bukkit/block/Hopper.java b/src/main/java/org/bukkit/block/Hopper.java
index 8e5e3e8..c08a1a5 100644
index 8e5e3e89..c08a1a50 100644
--- a/src/main/java/org/bukkit/block/Hopper.java
+++ b/src/main/java/org/bukkit/block/Hopper.java
@@ -1,9 +1,12 @@
@ -353,7 +353,7 @@ index 8e5e3e8..c08a1a5 100644
+
+}
diff --git a/src/main/java/org/bukkit/block/ShulkerBox.java b/src/main/java/org/bukkit/block/ShulkerBox.java
index 003cfb8..7b40df1 100644
index 003cfb8a..7b40df14 100644
--- a/src/main/java/org/bukkit/block/ShulkerBox.java
+++ b/src/main/java/org/bukkit/block/ShulkerBox.java
@@ -1,5 +1,6 @@
@ -373,5 +373,5 @@ index 003cfb8..7b40df1 100644
/**
* Get the {@link DyeColor} corresponding to this ShulkerBox
--
2.9.3
2.12.2

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

6
Spigot-API-Patches/0039-Misc-Utils.patch
View file

@ -1,4 +1,4 @@
From 80f595a006d469d8fe65d1324ee05d8b498a1ce5 Mon Sep 17 00:00:00 2001
From a5a7153cde37ce84714514cd647693113fdea266 Mon Sep 17 00:00:00 2001
From: vemacs <d@nkmem.es>
Date: Wed, 23 Nov 2016 12:53:43 -0500
Subject: [PATCH] Misc Utils
@ -6,7 +6,7 @@ Subject: [PATCH] Misc Utils
diff --git a/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java b/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java
new file mode 100644
index 0000000..d60ecbb
index 00000000..d60ecbb1
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java
@@ -0,0 +1,31 @@
@ -42,5 +42,5 @@ index 0000000..d60ecbb
+ }
+}
--
2.9.3
2.12.2

4
Spigot-API-Patches/0040-Allow-Reloading-of-Command-Aliases.patch
View file

@ -1,4 +1,4 @@
From 9b40254808daac69e7657b3c20e4316de8cfac6b Mon Sep 17 00:00:00 2001
From 5075ebcd06026e2d2e713d47e86d4ad0ddbcbc2b Mon Sep 17 00:00:00 2001
From: willies952002 <admin@domnian.com>
Date: Mon, 28 Nov 2016 10:16:39 -0500
Subject: [PATCH] Allow Reloading of Command Aliases
@ -94,5 +94,5 @@ index 040509c1..0069bcc0 100644
confirmed = true;
} else {
--
2.11.0
2.12.2

6
Spigot-API-Patches/0041-Add-source-to-PlayerExpChangeEvent.patch
View file

@ -1,11 +1,11 @@
From 381bcc72af916fa0e30ba7c0701484e647c640dc Mon Sep 17 00:00:00 2001
From 6b4ec223ad07f5f8c5392bf724acfa4b6765c1de Mon Sep 17 00:00:00 2001
From: AlphaBlend <whizkid3000@hotmail.com>
Date: Thu, 8 Sep 2016 08:47:08 -0700
Subject: [PATCH] Add source to PlayerExpChangeEvent
diff --git a/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java b/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
index f37491d..3088255 100644
index f37491d7..30882559 100644
--- a/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
@@ -1,21 +1,43 @@
@ -53,5 +53,5 @@ index f37491d..3088255 100644
*
* @return The amount of experience
--
2.9.3
2.12.2

6
Spigot-API-Patches/0042-Add-ProjectileCollideEvent.patch
View file

@ -1,4 +1,4 @@
From 5fba5a4e75e64bfb2b2b73ff39cbe55dd12ee1b9 Mon Sep 17 00:00:00 2001
From 8a1678e60bc1ddc67b3b8cacbb6761daf1a97fc6 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Fri, 16 Dec 2016 21:25:39 -0600
Subject: [PATCH] Add ProjectileCollideEvent
@ -6,7 +6,7 @@ Subject: [PATCH] Add ProjectileCollideEvent
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java
new file mode 100644
index 0000000..f42e985
index 00000000..f42e9851
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java
@@ -0,0 +1,62 @@
@ -73,5 +73,5 @@ index 0000000..f42e985
+ }
+}
--
2.9.3
2.12.2

4
Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch
View file

@ -1,4 +1,4 @@
From d6bb5c03434b922e1743da728186da22bc0786fe Mon Sep 17 00:00:00 2001
From 309d69927547f1e1da781153bd9f0b851facbe6a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 20 Dec 2016 15:55:55 -0500
Subject: [PATCH] Add String based Action Bar API
@ -73,5 +73,5 @@ index a0b95550..2c166a8c 100644
throw new UnsupportedOperationException("Not supported yet.");
}
--
2.12.1.windows.1
2.12.2

6
Spigot-API-Patches/0044-Add-API-methods-to-control-if-armour-stands-can-move.patch
View file

@ -1,11 +1,11 @@
From 78d6bbb91f72258376e3518b8f9f19eb3b91adee Mon Sep 17 00:00:00 2001
From 85ee642fb344d3aa7bb5a256cd1edcb1ab6a673b Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Wed, 21 Dec 2016 11:47:25 -0600
Subject: [PATCH] Add API methods to control if armour stands can move
diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
index b4f0451..099da6c 100644
index b4f04517..099da6ce 100644
--- a/src/main/java/org/bukkit/entity/ArmorStand.java
+++ b/src/main/java/org/bukkit/entity/ArmorStand.java
@@ -258,4 +258,22 @@ public interface ArmorStand extends LivingEntity {
@ -32,5 +32,5 @@ index b4f0451..099da6c 100644
+ // Paper end
}
--
2.9.3
2.12.2

6
Spigot-API-Patches/0045-IllegalPacketEvent.patch
View file

@ -1,4 +1,4 @@
From bad77ff8bbca1adeb51a99369b3aaaaf5046b7ee Mon Sep 17 00:00:00 2001
From 89165c8a70cce041d5daead1b9aadc8f214798a9 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 4 Dec 2016 01:19:14 -0500
Subject: [PATCH] IllegalPacketEvent
@ -9,7 +9,7 @@ Lets plugins change the kick message and if it should kick or not.
diff --git a/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java b/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java
new file mode 100644
index 0000000..e11f74f
index 00000000..e11f74fc
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java
@@ -0,0 +1,63 @@
@ -77,5 +77,5 @@ index 0000000..e11f74f
+ }
+}
--
2.9.3
2.12.2