NOT FINISHED! She compiles, and she... suffers the wrath of chunkgen...

This commit is contained in:
Shane Freeder 2018-07-19 05:42:43 +01:00
parent 3bcba64d28
commit 84c98c2ba8
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
422 changed files with 972 additions and 1950 deletions

View file

@ -1,4 +1,4 @@
From 6930a5ac9c5a9fba958a9d72769f6be40c406fd0 Mon Sep 17 00:00:00 2001 From 4e2445c63fba52523da6ce11e8cf8a241cf593f3 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Mon, 29 Feb 2016 17:50:31 -0600 Date: Mon, 29 Feb 2016 17:50:31 -0600
Subject: [PATCH] Entity Origin API Subject: [PATCH] Entity Origin API

View file

@ -1,4 +1,4 @@
From 5a25f66a6e73b622258aeee69d25128aed24693a Mon Sep 17 00:00:00 2001 From e620711210aa3c63c7db3c39154cfecd9acc9e08 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 17:58:01 -0600 Date: Mon, 29 Feb 2016 17:58:01 -0600
Subject: [PATCH] Check Paper versions Subject: [PATCH] Check Paper versions
@ -148,5 +148,5 @@ index 760d58eb..044361af 100644
+ // Paper end + // Paper end
} }
-- --
2.17.0 2.18.0

View file

@ -1,4 +1,4 @@
From c05775d4577ba7f7af96d9cb1328fb26319b68aa Mon Sep 17 00:00:00 2001 From 501e01d868ec3f41f8aa3a1bebc83b4305723b42 Mon Sep 17 00:00:00 2001
From: Isaac Moore <rmsy@me.com> From: Isaac Moore <rmsy@me.com>
Date: Mon, 29 Feb 2016 18:02:25 -0600 Date: Mon, 29 Feb 2016 18:02:25 -0600
Subject: [PATCH] Add PlayerLocaleChangeEvent Subject: [PATCH] Add PlayerLocaleChangeEvent
@ -61,5 +61,5 @@ index 00000000..29dd763a
+ } + }
+} +}
-- --
2.13.0.windows.1 2.18.0

View file

@ -1,11 +1,11 @@
From 94631204e639719102979cff8ef0d8445543d40c Mon Sep 17 00:00:00 2001 From a046e06ee22190a42f8ec203d7b106a9271c09f2 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Mon, 29 Feb 2016 18:05:37 -0600 Date: Mon, 29 Feb 2016 18:05:37 -0600
Subject: [PATCH] Add player view distance API Subject: [PATCH] Add player view distance API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 0481f15b..868d0374 100644 index 25e44028..7f215f1a 100644
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1450,6 +1450,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline @@ -1450,6 +1450,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline

View file

@ -1,4 +1,4 @@
From 0aa465c3441c5e1668d2437c0c6cf5dc15b1744d Mon Sep 17 00:00:00 2001 From e9e1ec6471574850b8eb0cd61bb019a05d7adbb2 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Mon, 29 Feb 2016 18:09:40 -0600 Date: Mon, 29 Feb 2016 18:09:40 -0600
Subject: [PATCH] Add BeaconEffectEvent Subject: [PATCH] Add BeaconEffectEvent
@ -6,7 +6,7 @@ Subject: [PATCH] Add BeaconEffectEvent
diff --git a/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java b/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java diff --git a/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java b/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java
new file mode 100644 new file mode 100644
index 0000000..6579ae9 index 00000000..6579ae99
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java +++ b/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java
@@ -0,0 +1,81 @@ @@ -0,0 +1,81 @@
@ -92,5 +92,5 @@ index 0000000..6579ae9
+ } + }
+} +}
-- --
2.9.2.windows.1 2.18.0

View file

@ -1,4 +1,4 @@
From f41fd8808accbe9c7771647d3beddc54fc5e7036 Mon Sep 17 00:00:00 2001 From facd6dc1bbfc8a8f13398666f37d86892ce761cc Mon Sep 17 00:00:00 2001
From: Steve Anton <anxuiz.nx@gmail.com> From: Steve Anton <anxuiz.nx@gmail.com>
Date: Mon, 29 Feb 2016 18:13:58 -0600 Date: Mon, 29 Feb 2016 18:13:58 -0600
Subject: [PATCH] Add PlayerInitialSpawnEvent Subject: [PATCH] Add PlayerInitialSpawnEvent
@ -7,7 +7,7 @@ For modifying a player's initial spawn location as they join the server
diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java
new file mode 100644 new file mode 100644
index 0000000..d1d6f33 index 00000000..d1d6f33c
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java
@@ -0,0 +1,43 @@ @@ -0,0 +1,43 @@
@ -55,5 +55,5 @@ index 0000000..d1d6f33
+ } + }
+} +}
-- --
2.10.0.windows.1 2.18.0

View file

@ -1,11 +1,11 @@
From c5908bf5ae2b8e9dc4058efb952dc182561ec098 Mon Sep 17 00:00:00 2001 From 8afe8ac5e2901bf492b1465e4a5ec43117bebdc2 Mon Sep 17 00:00:00 2001
From: Nik Gil <nikmanG@users.noreply.github.com> From: Nik Gil <nikmanG@users.noreply.github.com>
Date: Mon, 29 Feb 2016 19:42:10 -0600 Date: Mon, 29 Feb 2016 19:42:10 -0600
Subject: [PATCH] Made EntityDismountEvent Cancellable Subject: [PATCH] Made EntityDismountEvent Cancellable
diff --git a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java diff --git a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
index 24d4942..ce989bb 100644 index 24d4942a..ce989bb1 100644
--- a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java --- a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
+++ b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java +++ b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
@ -43,5 +43,5 @@ index 24d4942..ce989bb 100644
+ // Paper end + // Paper end
} }
-- --
2.9.2.windows.1 2.18.0

View file

@ -1,4 +1,4 @@
From a550e7f0f5f00bea6d9b453614818877a470ebb6 Mon Sep 17 00:00:00 2001 From 283da38a9b2ea8a978ea570e8446f487caaf6f10 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 19:45:21 -0600 Date: Mon, 29 Feb 2016 19:45:21 -0600
Subject: [PATCH] Automatically disable plugins that fail to load Subject: [PATCH] Automatically disable plugins that fail to load

View file

@ -1,4 +1,4 @@
From 4c420ccc71dd397e1a2de5a060165442d05a2a94 Mon Sep 17 00:00:00 2001 From d7b3294ee2ca409a7de9da69d863974ee1823872 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc> From: kashike <kashike@vq.lc>
Date: Mon, 29 Feb 2016 19:48:59 -0600 Date: Mon, 29 Feb 2016 19:48:59 -0600
Subject: [PATCH] Expose server CommandMap Subject: [PATCH] Expose server CommandMap

View file

@ -1,4 +1,4 @@
From dacfc488e4c39d47f1abd93ced7ec81d92909d38 Mon Sep 17 00:00:00 2001 From 3b0d21ce147ba8825a3e5b64923a11d1a81fdbbf Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 19:54:32 -0600 Date: Mon, 29 Feb 2016 19:54:32 -0600
Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
@ -68,7 +68,7 @@ index 2b43ac1f..d8ce8173 100644
* Gets the name of the update folder. The update folder is used to safely * Gets the name of the update folder. The update folder is used to safely
* update plugins at the right moment on a plugin load. * update plugins at the right moment on a plugin load.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 868d0374..c2977dc4 100644 index 7f215f1a..f4d1ade5 100644
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -392,6 +392,36 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline @@ -392,6 +392,36 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline

View file

@ -1,4 +1,4 @@
From f92adf1fcee4fba200652a7cc9fea03897c26bb4 Mon Sep 17 00:00:00 2001 From e5ee86a01a83c6c38f2ad58a4e534af73d54847c Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com> From: Techcable <Techcable@outlook.com>
Date: Mon, 29 Feb 2016 20:02:40 -0600 Date: Mon, 29 Feb 2016 20:02:40 -0600
Subject: [PATCH] Player Tab List and Title APIs Subject: [PATCH] Player Tab List and Title APIs
@ -369,7 +369,7 @@ index 00000000..3c2b63db
+ } + }
+} +}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index c2977dc4..5dbec412 100644 index f4d1ade5..65b7a076 100644
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2,6 +2,7 @@ package org.bukkit.entity; @@ -2,6 +2,7 @@ package org.bukkit.entity;

View file

@ -1,4 +1,4 @@
From b8567d82eae818cbf98656b6107c703d49d19916 Mon Sep 17 00:00:00 2001 From ec5c5dcdcd3e5a6dd7a4d5620c73274f94071b80 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 20:24:35 -0600 Date: Mon, 29 Feb 2016 20:24:35 -0600
Subject: [PATCH] Add exception reporting event Subject: [PATCH] Add exception reporting event
@ -592,5 +592,5 @@ index 80c152ba..b88f31ca 100644
} }
} }
-- --
2.17.0 (Apple Git-106) 2.18.0

View file

@ -1,4 +1,4 @@
From 1e93486b23234fe77e28702c767735e6e1bc4c77 Mon Sep 17 00:00:00 2001 From 8f1e66f25039c51d7e83c9c9ffae25ac434acb2b Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 20:26:39 -0600 Date: Mon, 29 Feb 2016 20:26:39 -0600
Subject: [PATCH] Fix ServerListPingEvent flagging as Async Subject: [PATCH] Fix ServerListPingEvent flagging as Async
@ -50,5 +50,5 @@ index 343f238f..3c38d857 100644
this.address = address; this.address = address;
this.motd = motd; this.motd = motd;
-- --
2.17.0.windows.1 2.18.0

View file

@ -1,4 +1,4 @@
From 59307ee0a977ee3d99fd9e44acb1bd3e5b040fc4 Mon Sep 17 00:00:00 2001 From 4d1f4491596b61d5a58c4446d1a58954e53b1f1d Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc> From: kashike <kashike@vq.lc>
Date: Tue, 8 Mar 2016 13:05:59 -0800 Date: Tue, 8 Mar 2016 13:05:59 -0800
Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender
@ -40,7 +40,7 @@ index abf68a2c..fcb03b83 100644
+ // Paper end + // Paper end
} }
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 5dbec412..5955b20c 100644 index 65b7a076..1837a14c 100644
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -399,6 +399,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline @@ -399,6 +399,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline

View file

@ -1,4 +1,4 @@
From 627bc079ead8a9849e8b0046a4045aa8ff3a69f8 Mon Sep 17 00:00:00 2001 From 70a25e1acdf0f9edfdde947fdb97aef644535ee3 Mon Sep 17 00:00:00 2001
From: mrapple <tony@oc.tc> From: mrapple <tony@oc.tc>
Date: Sun, 25 Nov 2012 13:47:27 -0600 Date: Sun, 25 Nov 2012 13:47:27 -0600
Subject: [PATCH] Add methods for working with arrows stuck in living entities Subject: [PATCH] Add methods for working with arrows stuck in living entities

View file

@ -1,4 +1,4 @@
From 25ab827755fbe15e9f3c4165140a16be9689ed81 Mon Sep 17 00:00:00 2001 From 1d993cf07f29d709b5cae8a3e04528675d7e7aea Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com> From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 4 Apr 2015 22:59:54 -0400 Date: Sat, 4 Apr 2015 22:59:54 -0400
Subject: [PATCH] Complete resource pack API Subject: [PATCH] Complete resource pack API

View file

@ -1,4 +1,4 @@
From 39bd1036ea8a04cd417c8bab59421ef5e7ba6e0c Mon Sep 17 00:00:00 2001 From 1469b97863ed5e841689d1347d6183189fef27cb Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com> From: Techcable <Techcable@outlook.com>
Date: Thu, 3 Mar 2016 13:20:33 -0700 Date: Thu, 3 Mar 2016 13:20:33 -0700
Subject: [PATCH] Use ASM for event executors. Subject: [PATCH] Use ASM for event executors.

View file

@ -1,4 +1,4 @@
From 544b5f21dd978f9b7ecd0a546421aa11b5c3a159 Mon Sep 17 00:00:00 2001 From e9cc1e95622f2b2f51b02a3a0b32911c3c760613 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 19 May 2013 20:36:58 -0400 Date: Sun, 19 May 2013 20:36:58 -0400
Subject: [PATCH] Add a call helper to Event Subject: [PATCH] Add a call helper to Event
@ -6,7 +6,7 @@ Subject: [PATCH] Add a call helper to Event
Reduces diff in Server patches Reduces diff in Server patches
diff --git a/src/main/java/org/bukkit/event/Event.java b/src/main/java/org/bukkit/event/Event.java diff --git a/src/main/java/org/bukkit/event/Event.java b/src/main/java/org/bukkit/event/Event.java
index 6677e1b..eaf6c49 100644 index 6677e1bd..e7061112 100644
--- a/src/main/java/org/bukkit/event/Event.java --- a/src/main/java/org/bukkit/event/Event.java
+++ b/src/main/java/org/bukkit/event/Event.java +++ b/src/main/java/org/bukkit/event/Event.java
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
@ -40,5 +40,5 @@ index 6677e1b..eaf6c49 100644
* Convenience method for providing a user-friendly identifier. By * Convenience method for providing a user-friendly identifier. By
* default, it is the event's class's {@linkplain Class#getSimpleName() * default, it is the event's class's {@linkplain Class#getSimpleName()
-- --
2.9.2.windows.1 2.18.0

View file

@ -1,4 +1,4 @@
From dc7ba2b869b5b5eefdac16a147446461bb40538f Mon Sep 17 00:00:00 2001 From b5c4f4748f637c8ddccffbcdef249b4abe7f4401 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 22 Jul 2015 18:50:41 -0400 Date: Wed, 22 Jul 2015 18:50:41 -0400
Subject: [PATCH] Add sender name to commands.yml replacement Subject: [PATCH] Add sender name to commands.yml replacement
@ -42,5 +42,5 @@ index 9c80f464..631be1cb 100644
while (index != -1) { while (index != -1) {
int start = index; int start = index;
-- --
2.14.3 2.18.0

View file

@ -1,4 +1,4 @@
From 82464080bcceeb115e6255fdf6054bd6a1c42ed8 Mon Sep 17 00:00:00 2001 From 2a58c6ce3ba2b1829a250a3a66ed0e2ebba73f79 Mon Sep 17 00:00:00 2001
From: William <admin@domnian.com> From: William <admin@domnian.com>
Date: Fri, 18 Mar 2016 03:28:07 -0400 Date: Fri, 18 Mar 2016 03:28:07 -0400
Subject: [PATCH] Add command to reload permissions.yml and require confirm to Subject: [PATCH] Add command to reload permissions.yml and require confirm to

View file

@ -1,4 +1,4 @@
From be5afd90beb1063d903d94f39ad8ce38c8545536 Mon Sep 17 00:00:00 2001 From c92da34fc23a3a8c4bd298cf1e752b43ce81a88a Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com> From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sun, 21 Jun 2015 15:05:21 -0400 Date: Sun, 21 Jun 2015 15:05:21 -0400
Subject: [PATCH] Custom replacement for eaten items Subject: [PATCH] Custom replacement for eaten items
@ -56,5 +56,5 @@ index 8ab76b1d..7d28155b 100644
return this.isCancelled; return this.isCancelled;
} }
-- --
2.13.0.windows.1 2.18.0

View file

@ -1,4 +1,4 @@
From f80aa26f12eced5a3b9c74ef82fa4696dab218de Mon Sep 17 00:00:00 2001 From ad5444f104e8943b5cd8fe2110dfa6e74c47ab0c Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com> From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sun, 20 Mar 2016 06:44:49 -0400 Date: Sun, 20 Mar 2016 06:44:49 -0400
Subject: [PATCH] Access items by EquipmentSlot Subject: [PATCH] Access items by EquipmentSlot

View file

@ -1,4 +1,4 @@
From afba862bcba12099ebab00ff767bf8d8ff49610b Mon Sep 17 00:00:00 2001 From d66b6b3d8cf42eee8c7d432bfeeb8618eb1c3125 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 20:26:34 -0400 Date: Mon, 28 Mar 2016 20:26:34 -0400
Subject: [PATCH] Entity AddTo/RemoveFrom World Events Subject: [PATCH] Entity AddTo/RemoveFrom World Events
@ -6,7 +6,7 @@ Subject: [PATCH] Entity AddTo/RemoveFrom World Events
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java
new file mode 100644 new file mode 100644
index 0000000..18b158c index 00000000..18b158cd
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java
@@ -0,0 +1,29 @@ @@ -0,0 +1,29 @@
@ -41,7 +41,7 @@ index 0000000..18b158c
+} +}
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java
new file mode 100644 new file mode 100644
index 0000000..800be6a index 00000000..800be6aa
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java
@@ -0,0 +1,26 @@ @@ -0,0 +1,26 @@
@ -72,5 +72,5 @@ index 0000000..800be6a
+ } + }
+} +}
-- --
2.9.2.windows.1 2.18.0

View file

@ -1,4 +1,4 @@
From 93eda7e71ee827d84d3d670f01d6c25388e7578f Mon Sep 17 00:00:00 2001 From e3f57f03c3b0a7dfb8399bc60c9854d7c5369397 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 21:15:34 -0400 Date: Mon, 28 Mar 2016 21:15:34 -0400
Subject: [PATCH] EntityPathfindEvent Subject: [PATCH] EntityPathfindEvent

View file

@ -1,4 +1,4 @@
From 270a57e64ae5f5a383b35a424dab9a45aa781eaf Mon Sep 17 00:00:00 2001 From c0a5945074128db7e77a353aa9035b7d0f01acb7 Mon Sep 17 00:00:00 2001
From: crast <contact@jamescrasta.com> From: crast <contact@jamescrasta.com>
Date: Sat, 1 Jun 2013 13:52:30 -0600 Date: Sat, 1 Jun 2013 13:52:30 -0600
Subject: [PATCH] Reduce thread synchronization in MetadataStoreBase Subject: [PATCH] Reduce thread synchronization in MetadataStoreBase
@ -8,7 +8,7 @@ limited synchronized portions to allow much higher concurrency in
MetadataStore as well as far less locking, especially on reads MetadataStore as well as far less locking, especially on reads
diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
index 093c144..64c0f0a 100644 index 093c1445..64c0f0a7 100644
--- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java --- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
+++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java +++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
@@ -4,9 +4,10 @@ import org.apache.commons.lang.Validate; @@ -4,9 +4,10 @@ import org.apache.commons.lang.Validate;
@ -101,5 +101,5 @@ index 093c144..64c0f0a 100644
for (Map<Plugin, MetadataValue> values : metadataMap.values()) { for (Map<Plugin, MetadataValue> values : metadataMap.values()) {
if (values.containsKey(owningPlugin)) { if (values.containsKey(owningPlugin)) {
-- --
2.9.2.windows.1 2.18.0

View file

@ -1,4 +1,4 @@
From 132974ff5e4f0932c730ed93725812e52c234bd7 Mon Sep 17 00:00:00 2001 From ff8d88096d58f9f801a4d6b49ef0eede65667989 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 16 Jul 2013 21:26:50 -0400 Date: Tue, 16 Jul 2013 21:26:50 -0400
Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin) Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin)
@ -37,5 +37,5 @@ index 64c0f0a7..6da6abd8 100644
* Creates a unique name for the object receiving metadata by combining * Creates a unique name for the object receiving metadata by combining
* unique data from the subject with a metadataKey. * unique data from the subject with a metadataKey.
-- --
2.16.2 2.18.0

View file

@ -1,4 +1,4 @@
From f63d0416b0cfb04ee48688f93db07c1c439e4c1c Mon Sep 17 00:00:00 2001 From 97a35e82ddb729fd74ce6d252a2c928a24b39d55 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com> From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 2 Apr 2016 05:08:36 -0400 Date: Sat, 2 Apr 2016 05:08:36 -0400
Subject: [PATCH] Add PlayerUseUnknownEntityEvent Subject: [PATCH] Add PlayerUseUnknownEntityEvent
@ -53,5 +53,5 @@ index 00000000..70eeaf5c
+ } + }
+} +}
-- --
2.12.2 2.18.0

View file

@ -1,4 +1,4 @@
From c2d3f644f72d2928e2196f19aedcebf30669b505 Mon Sep 17 00:00:00 2001 From 7c3fcd8ee8df766361c426d25955b626eac60d88 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc> From: kashike <kashike@vq.lc>
Date: Wed, 13 Apr 2016 20:20:18 -0700 Date: Wed, 13 Apr 2016 20:20:18 -0700
Subject: [PATCH] Add handshake event to allow plugins to handle client Subject: [PATCH] Add handshake event to allow plugins to handle client
@ -223,5 +223,5 @@ index 00000000..e44d03a2
+ } + }
+} +}
-- --
2.16.2 2.18.0

View file

@ -1,4 +1,4 @@
From 4c38a0b7c20bd533e8ca2f93edd4e1657aba85fe Mon Sep 17 00:00:00 2001 From 19fcaea4b23887be2eaa4d5e5bded0fa3ceca3ab Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com> From: Jedediah Smith <jedediah@silencegreys.com>
Date: Fri, 4 Mar 2016 03:13:18 -0500 Date: Fri, 4 Mar 2016 03:13:18 -0500
Subject: [PATCH] Arrow pickup rule API Subject: [PATCH] Arrow pickup rule API
@ -48,5 +48,5 @@ index 99814eee..34dde443 100644
+ // Paper end + // Paper end
} }
-- --
2.17.0 2.18.0

View file

@ -1,4 +1,4 @@
From 0d97df2900c479d7713b9b02c3eaeb6624c6a1c1 Mon Sep 17 00:00:00 2001 From 49a798ea1efd88482f5860292339b3229ebbf877 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Fri, 22 Apr 2016 01:43:11 -0500 Date: Fri, 22 Apr 2016 01:43:11 -0500
Subject: [PATCH] EntityRegainHealthEvent isFastRegen API Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
@ -41,5 +41,5 @@ index 1dd50c56..74fc12e9 100644
/** /**
* Gets the amount of regained health * Gets the amount of regained health
-- --
2.13.2 2.18.0

View file

@ -1,4 +1,4 @@
From 75943d87ca42348d2b2e4bc29498717ec1390150 Mon Sep 17 00:00:00 2001 From 47d3999f281a9271cec4bdec2cc226b05d3ebf40 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 1 May 2016 15:19:49 -0400 Date: Sun, 1 May 2016 15:19:49 -0400
Subject: [PATCH] LootTable API Subject: [PATCH] LootTable API
@ -368,5 +368,5 @@ index 4c1740e7..aa1109c4 100644
/** /**
* Get the {@link DyeColor} corresponding to this ShulkerBox * Get the {@link DyeColor} corresponding to this ShulkerBox
-- --
2.13.4 2.18.0

View file

@ -1,4 +1,4 @@
From 2b3054eda2cfa7dd47f019fa1d1eda5537c73266 Mon Sep 17 00:00:00 2001 From fa59003d856eb5f54a4a9bf0a26b7e55ae3a0713 Mon Sep 17 00:00:00 2001
From: AlphaBlend <whizkid3000@hotmail.com> From: AlphaBlend <whizkid3000@hotmail.com>
Date: Sun, 16 Oct 2016 23:19:34 -0700 Date: Sun, 16 Oct 2016 23:19:34 -0700
Subject: [PATCH] Add EntityZapEvent Subject: [PATCH] Add EntityZapEvent
@ -119,5 +119,5 @@ index aa80ebf1..73844b8f 100644
+ // Paper end + // Paper end
} }
-- --
2.12.2 2.18.0

View file

@ -1,4 +1,4 @@
From a5a7153cde37ce84714514cd647693113fdea266 Mon Sep 17 00:00:00 2001 From ae850cec0afe270d11a66245c0d9e46a16339283 Mon Sep 17 00:00:00 2001
From: vemacs <d@nkmem.es> From: vemacs <d@nkmem.es>
Date: Wed, 23 Nov 2016 12:53:43 -0500 Date: Wed, 23 Nov 2016 12:53:43 -0500
Subject: [PATCH] Misc Utils Subject: [PATCH] Misc Utils
@ -42,5 +42,5 @@ index 00000000..d60ecbb1
+ } + }
+} +}
-- --
2.12.2 2.18.0

View file

@ -1,4 +1,4 @@
From a26f4d70297afac3b04e84ed6ad1b2b1c97558ef Mon Sep 17 00:00:00 2001 From f6f33b7c1532051a557eb8aba788a930f031243b Mon Sep 17 00:00:00 2001
From: willies952002 <admin@domnian.com> From: willies952002 <admin@domnian.com>
Date: Mon, 28 Nov 2016 10:16:39 -0500 Date: Mon, 28 Nov 2016 10:16:39 -0500
Subject: [PATCH] Allow Reloading of Command Aliases Subject: [PATCH] Allow Reloading of Command Aliases

View file

@ -1,4 +1,4 @@
From 94fda1a0b58189116a33dfb887a88e141fb5cad6 Mon Sep 17 00:00:00 2001 From e08937fe0886d2dbce1bdb74980b7cdbc778e628 Mon Sep 17 00:00:00 2001
From: AlphaBlend <whizkid3000@hotmail.com> From: AlphaBlend <whizkid3000@hotmail.com>
Date: Thu, 8 Sep 2016 08:47:08 -0700 Date: Thu, 8 Sep 2016 08:47:08 -0700
Subject: [PATCH] Add source to PlayerExpChangeEvent Subject: [PATCH] Add source to PlayerExpChangeEvent
@ -52,5 +52,5 @@ index f37491d7..30882559 100644
* Get the amount of experience the player will receive * Get the amount of experience the player will receive
* *
-- --
2.16.2 2.18.0

View file

@ -1,4 +1,4 @@
From 8a1678e60bc1ddc67b3b8cacbb6761daf1a97fc6 Mon Sep 17 00:00:00 2001 From da74019f26ab71c97991b2cf3474bc40a2c63bce Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com> From: Techcable <Techcable@outlook.com>
Date: Fri, 16 Dec 2016 21:25:39 -0600 Date: Fri, 16 Dec 2016 21:25:39 -0600
Subject: [PATCH] Add ProjectileCollideEvent Subject: [PATCH] Add ProjectileCollideEvent
@ -73,5 +73,5 @@ index 00000000..f42e9851
+ } + }
+} +}
-- --
2.12.2 2.18.0

View file

@ -1,4 +1,4 @@
From 08d440055e45edea4106415945fcfe5b7c3d1318 Mon Sep 17 00:00:00 2001 From d1c10cb8d00c3b6e9c8612bc30e9e7a715dd1ecf Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 20 Dec 2016 15:55:55 -0500 Date: Tue, 20 Dec 2016 15:55:55 -0500
Subject: [PATCH] Add String based Action Bar API Subject: [PATCH] Add String based Action Bar API

View file

@ -1,4 +1,4 @@
From 85ee642fb344d3aa7bb5a256cd1edcb1ab6a673b Mon Sep 17 00:00:00 2001 From 3c437859f9ef78609aac37e3afe173588ae67ee9 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc> From: kashike <kashike@vq.lc>
Date: Wed, 21 Dec 2016 11:47:25 -0600 Date: Wed, 21 Dec 2016 11:47:25 -0600
Subject: [PATCH] Add API methods to control if armour stands can move Subject: [PATCH] Add API methods to control if armour stands can move
@ -32,5 +32,5 @@ index b4f04517..099da6ce 100644
+ // Paper end + // Paper end
} }
-- --
2.12.2 2.18.0

View file

@ -1,4 +1,4 @@
From 89165c8a70cce041d5daead1b9aadc8f214798a9 Mon Sep 17 00:00:00 2001 From dea71c291e5e4139c86b7570e6eed8897bde2e94 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 4 Dec 2016 01:19:14 -0500 Date: Sun, 4 Dec 2016 01:19:14 -0500
Subject: [PATCH] IllegalPacketEvent Subject: [PATCH] IllegalPacketEvent
@ -77,5 +77,5 @@ index 00000000..e11f74fc
+ } + }
+} +}
-- --
2.12.2 2.18.0

View file

@ -1,4 +1,4 @@
From f65a6ec0915047f1a5c30e467c5782bae67113d2 Mon Sep 17 00:00:00 2001 From 6705469275b33dd3cbb08048e0226fbca6c8599d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 28 Dec 2016 01:18:55 -0500 Date: Wed, 28 Dec 2016 01:18:55 -0500
Subject: [PATCH] Fireworks API's Subject: [PATCH] Fireworks API's
@ -7,7 +7,7 @@ Get the Entity being boosted
Get the firework launcher Get the firework launcher
diff --git a/src/main/java/org/bukkit/entity/Firework.java b/src/main/java/org/bukkit/entity/Firework.java diff --git a/src/main/java/org/bukkit/entity/Firework.java b/src/main/java/org/bukkit/entity/Firework.java
index b8a8c07..8c087bb 100644 index b8a8c075..8c087bb7 100644
--- a/src/main/java/org/bukkit/entity/Firework.java --- a/src/main/java/org/bukkit/entity/Firework.java
+++ b/src/main/java/org/bukkit/entity/Firework.java +++ b/src/main/java/org/bukkit/entity/Firework.java
@@ -2,6 +2,8 @@ package org.bukkit.entity; @@ -2,6 +2,8 @@ package org.bukkit.entity;
@ -34,5 +34,5 @@ index b8a8c07..8c087bb 100644
+ // Paper end + // Paper end
} }
-- --
2.9.3 2.18.0

View file

@ -1,4 +1,4 @@
From 5a007aa00644c0fc23b76553bd92756e5517eaf1 Mon Sep 17 00:00:00 2001 From f0f71311d0761cfb9c8ba1c5901f3e29223994ad Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sat, 31 Dec 2016 20:29:33 -0500 Date: Sat, 31 Dec 2016 20:29:33 -0500
Subject: [PATCH] PlayerTeleportEndGatewayEvent Subject: [PATCH] PlayerTeleportEndGatewayEvent
@ -39,5 +39,5 @@ index 00000000..bdefbc9f
+ } + }
+} +}
-- --
2.13.0.windows.1 2.18.0

View file

@ -1,4 +1,4 @@
From 22068d059027d02e6931f229dfa65987ca73871f Mon Sep 17 00:00:00 2001 From 33b64ea35d49023c95c359e7c8664335e202f7c0 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sat, 7 Jan 2017 15:23:03 -0500 Date: Sat, 7 Jan 2017 15:23:03 -0500
Subject: [PATCH] Provide E/TE/Chunk count stat methods Subject: [PATCH] Provide E/TE/Chunk count stat methods
@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size()
which creates copy of the collections. which creates copy of the collections.
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 22ab4633..65156e80 100644 index 91ad39a8..7875a71a 100644
--- a/src/main/java/org/bukkit/World.java --- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java
@@ -25,6 +25,33 @@ import org.bukkit.util.Vector; @@ -25,6 +25,33 @@ import org.bukkit.util.Vector;

View file

@ -1,4 +1,4 @@
From 80c13ed0dab738b2741d02291129c231a6e415a6 Mon Sep 17 00:00:00 2001 From 0e3f92f938875e2030ff8e1b7f559ecddca777f7 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 19 Dec 2017 16:28:32 -0500 Date: Tue, 19 Dec 2017 16:28:32 -0500
Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player
@ -115,5 +115,5 @@ index c286edfd..f847543b 100644
+ // Paper end + // Paper end
} }
-- --
2.15.1 2.18.0

View file

@ -1,11 +1,11 @@
From 3f1104eade7370f1304f56444a1b5e0d694ada62 Mon Sep 17 00:00:00 2001 From 0187592c026f6b460628219f3f2c4e48e9413bfc Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 21 Jan 2017 17:03:10 -0600 Date: Sat, 21 Jan 2017 17:03:10 -0600
Subject: [PATCH] Expose WorldBorder#isInBounds(Location) check Subject: [PATCH] Expose WorldBorder#isInBounds(Location) check
diff --git a/src/main/java/org/bukkit/WorldBorder.java b/src/main/java/org/bukkit/WorldBorder.java diff --git a/src/main/java/org/bukkit/WorldBorder.java b/src/main/java/org/bukkit/WorldBorder.java
index 4dc18ed..41b7fae 100644 index 4dc18edc..41b7fae6 100644
--- a/src/main/java/org/bukkit/WorldBorder.java --- a/src/main/java/org/bukkit/WorldBorder.java
+++ b/src/main/java/org/bukkit/WorldBorder.java +++ b/src/main/java/org/bukkit/WorldBorder.java
@@ -114,4 +114,18 @@ public interface WorldBorder { @@ -114,4 +114,18 @@ public interface WorldBorder {
@ -28,5 +28,5 @@ index 4dc18ed..41b7fae 100644
+ // Paper end + // Paper end
} }
-- --
2.9.3 2.18.0

View file

@ -1,4 +1,4 @@
From f4d2b6475d9965998e22ea9a072fbcb2231fca90 Mon Sep 17 00:00:00 2001 From 7d4cb175afd6bfc4763dd709865dbccd3ace51e7 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc> From: kashike <kashike@vq.lc>
Date: Fri, 9 Jun 2017 07:24:24 -0700 Date: Fri, 9 Jun 2017 07:24:24 -0700
Subject: [PATCH] Add configuration option to prevent player names from being Subject: [PATCH] Add configuration option to prevent player names from being

View file

@ -1,4 +1,4 @@
From bc65fcc9a464b4c8d7b28758d6fad8d98eefa05d Mon Sep 17 00:00:00 2001 From 95cc7e013040f4cc243d1d421ec2d8a62dacbfa2 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 10 Jun 2017 16:59:40 -0500 Date: Sat, 10 Jun 2017 16:59:40 -0500
Subject: [PATCH] Fix upstream javadoc warnings and errors Subject: [PATCH] Fix upstream javadoc warnings and errors
@ -21,10 +21,10 @@ index 1ed8f7e4..bd5238ce 100644
*/ */
@Deprecated @Deprecated
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 1e980d2d..4cc70326 100644 index 7875a71a..e14098fa 100644
--- a/src/main/java/org/bukkit/World.java --- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java
@@ -1376,6 +1376,7 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -1304,6 +1304,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param count the number of particles * @param count the number of particles
* @param data the data to use for the particle or null, * @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()} * the type of this depends on {@link Particle#getDataType()}
@ -32,7 +32,7 @@ index 1e980d2d..4cc70326 100644
*/ */
public <T> void spawnParticle(Particle particle, Location location, int count, T data); public <T> void spawnParticle(Particle particle, Location location, int count, T data);
@@ -1391,6 +1392,7 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -1319,6 +1320,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param count the number of particles * @param count the number of particles
* @param data the data to use for the particle or null, * @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()} * the type of this depends on {@link Particle#getDataType()}
@ -40,7 +40,7 @@ index 1e980d2d..4cc70326 100644
*/ */
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, T data); public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, T data);
@@ -1440,6 +1442,7 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -1368,6 +1370,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param offsetZ the maximum random offset on the Z axis * @param offsetZ the maximum random offset on the Z axis
* @param data the data to use for the particle or null, * @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()} * the type of this depends on {@link Particle#getDataType()}
@ -48,7 +48,7 @@ index 1e980d2d..4cc70326 100644
*/ */
public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, T data); public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, T data);
@@ -1459,6 +1462,7 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -1387,6 +1390,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param offsetZ the maximum random offset on the Z axis * @param offsetZ the maximum random offset on the Z axis
* @param data the data to use for the particle or null, * @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()} * the type of this depends on {@link Particle#getDataType()}
@ -56,7 +56,7 @@ index 1e980d2d..4cc70326 100644
*/ */
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, T data); public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, T data);
@@ -1514,6 +1518,7 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -1442,6 +1446,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* particle used (normally speed) * particle used (normally speed)
* @param data the data to use for the particle or null, * @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()} * the type of this depends on {@link Particle#getDataType()}
@ -64,7 +64,7 @@ index 1e980d2d..4cc70326 100644
*/ */
public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data); public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
@@ -1535,6 +1540,7 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -1463,6 +1468,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* particle used (normally speed) * particle used (normally speed)
* @param data the data to use for the particle or null, * @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()} * the type of this depends on {@link Particle#getDataType()}
@ -335,7 +335,7 @@ index 034421a7..f1a54c23 100644
*/ */
@Deprecated @Deprecated
diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
index 92174e81..ac5cc32c 100644 index ab71f3c3..358ea386 100644
--- a/src/main/java/org/bukkit/scoreboard/Team.java --- a/src/main/java/org/bukkit/scoreboard/Team.java
+++ b/src/main/java/org/bukkit/scoreboard/Team.java +++ b/src/main/java/org/bukkit/scoreboard/Team.java
@@ -84,7 +84,7 @@ public interface Team { @@ -84,7 +84,7 @@ public interface Team {

View file

@ -1,4 +1,4 @@
From be61a682cc9453b4372ac821c4aea25ba90ba606 Mon Sep 17 00:00:00 2001 From dc66c4f09cb93dc94893badd5da732ed2178aa45 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com> From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Fri, 5 May 2017 03:57:08 -0500 Date: Fri, 5 May 2017 03:57:08 -0500
Subject: [PATCH] Item#canEntityPickup Subject: [PATCH] Item#canEntityPickup
@ -30,5 +30,5 @@ index 90260b7e..2e98e4f9 100644
+ // Paper end + // Paper end
} }
-- --
2.17.1 2.18.0

View file

@ -1,4 +1,4 @@
From 409f5510dda42a7cfd18698436fc766df133c4e2 Mon Sep 17 00:00:00 2001 From d9917e835f1e81e0b7d84ffc7ea4b60ca08eb3c4 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com> From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 7 May 2017 06:26:01 -0500 Date: Sun, 7 May 2017 06:26:01 -0500
Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
@ -52,5 +52,5 @@ index c76f423e..46c6d519 100644
@Override @Override
-- --
2.13.0 2.18.0

View file

@ -1,4 +1,4 @@
From d4c410f78c5e5fd8c0a6760d878843080572f49a Mon Sep 17 00:00:00 2001 From 1f46a8b98f035e8a17ccef525526dc0d02b7acbb Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com> From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 11 Jun 2017 16:30:37 -0500 Date: Sun, 11 Jun 2017 16:30:37 -0500
Subject: [PATCH] PlayerAttemptPickupItemEvent Subject: [PATCH] PlayerAttemptPickupItemEvent
@ -96,5 +96,5 @@ index 00000000..480293e9
+ } + }
+} +}
-- --
2.17.0 2.18.0

View file

@ -1,4 +1,4 @@
From f57a4ab8a98fe14d6591558f0eb061caf775b542 Mon Sep 17 00:00:00 2001 From d8cb5d408bac83ef3e7e83da92cc90904d4cd379 Mon Sep 17 00:00:00 2001
From: Sweepyoface <github@sweepy.pw> From: Sweepyoface <github@sweepy.pw>
Date: Sat, 17 Jun 2017 18:48:06 -0400 Date: Sat, 17 Jun 2017 18:48:06 -0400
Subject: [PATCH] Add UnknownCommandEvent Subject: [PATCH] Add UnknownCommandEvent
@ -88,5 +88,5 @@ index 00000000..19d634c3
+} +}
+ +
-- --
2.13.3 2.18.0

View file

@ -1,4 +1,4 @@
From fad181fcd8dcc38ff7dad667ec655c473844947a Mon Sep 17 00:00:00 2001 From 3d0560ecda8605d6932dd13669f315111764e724 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 15 Jan 2018 21:46:46 -0500 Date: Mon, 15 Jan 2018 21:46:46 -0500
Subject: [PATCH] Basic PlayerProfile API Subject: [PATCH] Basic PlayerProfile API

View file

@ -1,4 +1,4 @@
From 4ca727fe10c32507bd208efbecc6cb500fbf2534 Mon Sep 17 00:00:00 2001 From 495ea88275a4d9b96efb1db20a52c4566f3458e5 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sat, 17 Jun 2017 15:04:51 -0400 Date: Sat, 17 Jun 2017 15:04:51 -0400
Subject: [PATCH] Shoulder Entities Release API Subject: [PATCH] Shoulder Entities Release API
@ -34,5 +34,5 @@ index 518aa2a9..3939d4af 100644
* Gets the entity currently perched on the left shoulder or null if no * Gets the entity currently perched on the left shoulder or null if no
* entity. * entity.
-- --
2.15.1 2.18.0

View file

@ -1,4 +1,4 @@
From 6eb60d6f87fcc5b3ff0417a30fd5c79a51df2fa1 Mon Sep 17 00:00:00 2001 From c836087cd8822e93732c4f292489a13b77223a89 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sat, 17 Jun 2017 16:30:44 -0400 Date: Sat, 17 Jun 2017 16:30:44 -0400
Subject: [PATCH] Profile Lookup Events Subject: [PATCH] Profile Lookup Events
@ -7,7 +7,7 @@ Adds a Pre Lookup Event and a Post Lookup Event so that plugins may prefill in p
profiles that had to be looked up. profiles that had to be looked up.
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index dfc6c9b5..e1a39bfe 100644 index bd9146dd..44a8b2a5 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -61,6 +61,13 @@ @@ -61,6 +61,13 @@

View file

@ -1,11 +1,11 @@
From b6a1a9c6c4cec87d0234bc858239e1f0d0db36c1 Mon Sep 17 00:00:00 2001 From 0a3125353c085b5a16edb538480d5f712a6afde3 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com> From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 18 Jun 2017 18:17:05 -0500 Date: Sun, 18 Jun 2017 18:17:05 -0500
Subject: [PATCH] Entity#fromMobSpawner() Subject: [PATCH] Entity#fromMobSpawner()
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 69fbdb3c..6fc00fdf 100644 index 9b0f97f1..3ae4de7a 100644
--- a/src/main/java/org/bukkit/entity/Entity.java --- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -507,5 +507,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable { @@ -507,5 +507,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@ -22,5 +22,5 @@ index 69fbdb3c..6fc00fdf 100644
// Paper end // Paper end
} }
-- --
2.15.1 2.18.0

View file

@ -1,4 +1,4 @@
From d64ec328014274efa75dfacaf6b37cb11f642f69 Mon Sep 17 00:00:00 2001 From 233f6d000f7fa14bd2de6d6c5ba88cd4b9dc4170 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sat, 10 Dec 2016 16:12:48 -0500 Date: Sat, 10 Dec 2016 16:12:48 -0500
Subject: [PATCH] Improve the Saddle API for Horses Subject: [PATCH] Improve the Saddle API for Horses

View file

@ -1,4 +1,4 @@
From ac29eaf3c0dc567bfbe8e20a323cdfaefd6242b8 Mon Sep 17 00:00:00 2001 From 4f36318d8921ffa44333a86eac125200caad51d5 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 4 May 2016 23:55:48 -0400 Date: Wed, 4 May 2016 23:55:48 -0400
Subject: [PATCH] ensureServerConversions API Subject: [PATCH] ensureServerConversions API
@ -28,19 +28,24 @@ index 762c43d6..045c26d9 100644
+ // Paper end + // Paper end
} }
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index 6324044d..6df4b97a 100644 index 73f79b22..14b6b6b3 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java --- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -479,7 +479,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { @@ -487,7 +487,12 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
result.setDurability(damage); }
} }
- return result; - return result;
+ // Set damage again incase meta overwrote it
+ if (args.containsKey("damage")) {
+ result.setDurability(damage);
+ }
+
+ return result.ensureServerConversions(); // Paper + return result.ensureServerConversions(); // Paper
} }
/** /**
@@ -537,4 +537,18 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { @@ -545,4 +550,18 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
return true; return true;
} }

View file

@ -1,4 +1,4 @@
From b2d5adef80eed3964ab16df2c98789763d150fd7 Mon Sep 17 00:00:00 2001 From c1dbeb3ae74907b1336b1d68f76279b883bb35e3 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 4 May 2016 23:55:48 -0400 Date: Wed, 4 May 2016 23:55:48 -0400
Subject: [PATCH] Add getI18NDisplayName API Subject: [PATCH] Add getI18NDisplayName API
@ -28,10 +28,10 @@ index 045c26d9..47bbc0f9 100644
// Paper end // Paper end
} }
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index 6df4b97a..864b16b1 100644 index 14b6b6b3..ca7a958f 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java --- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -550,5 +550,16 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { @@ -563,5 +563,16 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
public ItemStack ensureServerConversions() { public ItemStack ensureServerConversions() {
return Bukkit.getServer().getItemFactory().ensureServerConversions(this); return Bukkit.getServer().getItemFactory().ensureServerConversions(this);
} }

View file

@ -1,4 +1,4 @@
From 1dfa87d569f72303f04c3a29130145c91f25f506 Mon Sep 17 00:00:00 2001 From 285c68e987f4db6db40f653a723754b5793dc6e8 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 3 Jul 2017 18:11:34 -0500 Date: Mon, 3 Jul 2017 18:11:34 -0500
Subject: [PATCH] ProfileWhitelistVerifyEvent Subject: [PATCH] ProfileWhitelistVerifyEvent

View file

@ -1,4 +1,4 @@
From 86390176ccf85c98f464e5ff6bb90f27952ae60a Mon Sep 17 00:00:00 2001 From 03867368971fb3bfad36b8ebe68d5948fd20ce0a Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com> From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Mon, 31 Jul 2017 02:08:55 -0500 Date: Mon, 31 Jul 2017 02:08:55 -0500
Subject: [PATCH] Make /plugins list alphabetical Subject: [PATCH] Make /plugins list alphabetical

View file

@ -1,11 +1,11 @@
From 7963cbbdb5c04bb9f749576c89573aaf1c2279bb Mon Sep 17 00:00:00 2001 From 054913afc1358179ae54b96956bce518334591ae Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com> From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Mon, 31 Jul 2017 01:49:43 -0500 Date: Mon, 31 Jul 2017 01:49:43 -0500
Subject: [PATCH] LivingEntity#setKiller Subject: [PATCH] LivingEntity#setKiller
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 4fafedc9..42cf95e1 100644 index f6ae0a6d..700ed29f 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java --- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -14,6 +14,8 @@ import org.bukkit.potion.PotionEffect; @@ -14,6 +14,8 @@ import org.bukkit.potion.PotionEffect;

View file

@ -1,4 +1,4 @@
From 99c169a9b437e6bd0088d70cb74c81a221808521 Mon Sep 17 00:00:00 2001 From ffdbb97e00e44a8d86086aee473e45fa54e0b281 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net> From: Minecrell <minecrell@minecrell.net>
Date: Thu, 21 Sep 2017 16:14:13 +0200 Date: Thu, 21 Sep 2017 16:14:13 +0200
Subject: [PATCH] Handle plugin prefixes in implementation logging Subject: [PATCH] Handle plugin prefixes in implementation logging

View file

@ -1,4 +1,4 @@
From 78649d9322cf676aeca08d8f43053600d34a619d Mon Sep 17 00:00:00 2001 From f9af8335c02b21624aeee8ac4cb1909d31bbff56 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net> From: Minecrell <minecrell@minecrell.net>
Date: Thu, 21 Sep 2017 16:33:12 +0200 Date: Thu, 21 Sep 2017 16:33:12 +0200
Subject: [PATCH] Allow plugins to use SLF4J for logging Subject: [PATCH] Allow plugins to use SLF4J for logging

View file

@ -1,4 +1,4 @@
From 0f5f1f61e5e6128993289722564719846613ed1b Mon Sep 17 00:00:00 2001 From df23e00168bf3e3ff97132c082e03cc7c1728649 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net> From: Minecrell <minecrell@minecrell.net>
Date: Thu, 21 Sep 2017 19:41:20 +0200 Date: Thu, 21 Sep 2017 19:41:20 +0200
Subject: [PATCH] Add workaround for plugins modifying the parent of the plugin Subject: [PATCH] Add workaround for plugins modifying the parent of the plugin

View file

@ -1,4 +1,4 @@
From cb37a11f62d5ad49044c57e9364911f5914708d9 Mon Sep 17 00:00:00 2001 From 9f1f05d5857e0ce2cd806931ce4db9230c379989 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Thu, 28 Sep 2017 17:21:32 -0400 Date: Thu, 28 Sep 2017 17:21:32 -0400
Subject: [PATCH] Add PlayerJumpEvent Subject: [PATCH] Add PlayerJumpEvent

View file

@ -1,4 +1,4 @@
From e3792c13f6e712593072cb31dc951110ff1e6632 Mon Sep 17 00:00:00 2001 From 4a4df5cf1adcaa8a25be2876c550c2ff2a517a67 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net> From: Minecrell <minecrell@minecrell.net>
Date: Tue, 10 Oct 2017 18:44:42 +0200 Date: Tue, 10 Oct 2017 18:44:42 +0200
Subject: [PATCH] Expose client protocol version and virtual host Subject: [PATCH] Expose client protocol version and virtual host

View file

@ -1,4 +1,4 @@
From a19dc4df4d2e6230616f78cc0eec847092cded18 Mon Sep 17 00:00:00 2001 From e7a01ce105a27097d7f08442b7db2aad136bcd7f Mon Sep 17 00:00:00 2001
From: pkt77 <parkerkt77@gmail.com> From: pkt77 <parkerkt77@gmail.com>
Date: Fri, 10 Nov 2017 23:45:59 -0500 Date: Fri, 10 Nov 2017 23:45:59 -0500
Subject: [PATCH] Add PlayerArmorChangeEvent Subject: [PATCH] Add PlayerArmorChangeEvent

View file

@ -1,4 +1,4 @@
From 5b78e31d0aeb0cfcf2d3e108326c660d3cfd7aa1 Mon Sep 17 00:00:00 2001 From 1cb04b32f151759c17629a384fa8547a255334a6 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 6 Nov 2017 21:10:01 -0500 Date: Mon, 6 Nov 2017 21:10:01 -0500
Subject: [PATCH] API to get a BlockState without a snapshot Subject: [PATCH] API to get a BlockState without a snapshot
@ -9,10 +9,10 @@ on the real tile entity.
This is useful for where performance is needed This is useful for where performance is needed
diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
index 1aa3373f..9aab043c 100644 index 679c29cf..238de6f0 100644
--- a/src/main/java/org/bukkit/block/Block.java --- a/src/main/java/org/bukkit/block/Block.java
+++ b/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java
@@ -242,6 +242,15 @@ public interface Block extends Metadatable { @@ -223,6 +223,15 @@ public interface Block extends Metadatable {
*/ */
BlockState getState(); BlockState getState();

View file

@ -1,4 +1,4 @@
From 2fe82eb2c39bc39aa0264a02db45e8bf643d1d26 Mon Sep 17 00:00:00 2001 From c98afebdb0e60908d750e33e33c06ad612ac6434 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 26 Nov 2017 13:17:09 -0500 Date: Sun, 26 Nov 2017 13:17:09 -0500
Subject: [PATCH] AsyncTabCompleteEvent Subject: [PATCH] AsyncTabCompleteEvent

View file

@ -1,4 +1,4 @@
From 92fba1efc29b3550577a18bcf74cb41327f59019 Mon Sep 17 00:00:00 2001 From 120a11417f9d48ca7ae42393b88e4751583391ef Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sat, 9 Dec 2017 12:40:25 -0500 Date: Sat, 9 Dec 2017 12:40:25 -0500
Subject: [PATCH] Display warning on deprecated recipe API Subject: [PATCH] Display warning on deprecated recipe API

View file

@ -1,4 +1,4 @@
From 6acec34388a520536f958b9c92c632892c2cef27 Mon Sep 17 00:00:00 2001 From 7583b7eef0eb813aa2a79d214dea15eaab1b6dc7 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 19 Dec 2017 22:00:41 -0500 Date: Tue, 19 Dec 2017 22:00:41 -0500
Subject: [PATCH] PlayerPickupExperienceEvent Subject: [PATCH] PlayerPickupExperienceEvent

View file

@ -1,4 +1,4 @@
From 51c1f56626683e98d9c9728d6ebc399e0123a91b Mon Sep 17 00:00:00 2001 From ac086d03f6617bcc272e6d9d7547ed7d1e94c808 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 19 Dec 2017 22:56:24 -0500 Date: Tue, 19 Dec 2017 22:56:24 -0500
Subject: [PATCH] ExperienceOrbMergeEvent Subject: [PATCH] ExperienceOrbMergeEvent

View file

@ -1,4 +1,4 @@
From 468f4768ac979bb546fe16cc286ed533ac26e04e Mon Sep 17 00:00:00 2001 From a4490dff8b9cf87a9efbc8bbe807b629de2df02b Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 20 Dec 2017 17:38:07 -0500 Date: Wed, 20 Dec 2017 17:38:07 -0500
Subject: [PATCH] Ability to apply mending to XP API Subject: [PATCH] Ability to apply mending to XP API

View file

@ -1,4 +1,4 @@
From 4171ce67cc2901442e728da492533f9fec795711 Mon Sep 17 00:00:00 2001 From d96e899da4fd2b553148ba115ac5b68ee27952ad Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 14 Jan 2018 16:59:43 -0500 Date: Sun, 14 Jan 2018 16:59:43 -0500
Subject: [PATCH] PreCreatureSpawnEvent Subject: [PATCH] PreCreatureSpawnEvent

View file

@ -1,4 +1,4 @@
From ce4a90e4f24108e85f7c66050711c1b5667085bb Mon Sep 17 00:00:00 2001 From c5154039ff463f366dae9a072e0c014f92eabedb Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 14 Jan 2018 17:31:37 -0500 Date: Sun, 14 Jan 2018 17:31:37 -0500
Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent

View file

@ -1,4 +1,4 @@
From fd43f9fb69c2e0792c33ee16e007134728a3df2d Mon Sep 17 00:00:00 2001 From 956b151ae68497ff34ebf1f4dc540cc88754f276 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 19 Jan 2018 00:29:28 -0500 Date: Fri, 19 Jan 2018 00:29:28 -0500
Subject: [PATCH] Add SkullMeta.setPlayerProfile API Subject: [PATCH] Add SkullMeta.setPlayerProfile API

View file

@ -1,4 +1,4 @@
From f932e1e9c552db09887c010fbb179ddf05d4a416 Mon Sep 17 00:00:00 2001 From c3ae932f11c94cfa5b46fc5b11b04a283260708f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 2 Jan 2018 00:31:08 -0500 Date: Tue, 2 Jan 2018 00:31:08 -0500
Subject: [PATCH] Fill Profile Property Events Subject: [PATCH] Fill Profile Property Events

View file

@ -1,4 +1,4 @@
From b19e61438f5405ee5e004322bed0fea411f18924 Mon Sep 17 00:00:00 2001 From c74290391d661bac5694c965fdd19e56cb6c9e42 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com> From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Fri, 19 Jan 2018 08:15:14 -0600 Date: Fri, 19 Jan 2018 08:15:14 -0600
Subject: [PATCH] PlayerAdvancementCriterionGrantEvent Subject: [PATCH] PlayerAdvancementCriterionGrantEvent

View file

@ -1,4 +1,4 @@
From 68d7994d386398bd6ad0a51efbb58f1d1357ba0d Mon Sep 17 00:00:00 2001 From d49f8976711a2afe8d57cf0a546332f8c95df6ad Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 27 Jan 2018 17:06:24 -0500 Date: Sat, 27 Jan 2018 17:06:24 -0500
Subject: [PATCH] Add ArmorStand Item Meta Subject: [PATCH] Add ArmorStand Item Meta

View file

@ -1,4 +1,4 @@
From 3d903c7ed998ce99c37f5b392021b982b9283955 Mon Sep 17 00:00:00 2001 From ad00ddb857bd631a9ae93eaabe76c044436f51d1 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 18 Jan 2018 01:00:27 -0500 Date: Thu, 18 Jan 2018 01:00:27 -0500
Subject: [PATCH] Optimize Hoppers Subject: [PATCH] Optimize Hoppers

View file

@ -1,4 +1,4 @@
From bc63e16534cb5f723604669f5acb8b70ad600eab Mon Sep 17 00:00:00 2001 From 49e9ab9b0b462f724ac9f77fbf6dd7c0c319225d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sat, 24 Feb 2018 00:55:52 -0500 Date: Sat, 24 Feb 2018 00:55:52 -0500
Subject: [PATCH] Tameable#getOwnerUniqueId API Subject: [PATCH] Tameable#getOwnerUniqueId API

View file

@ -1,4 +1,4 @@
From c438100df0d0e3f2210c8a932e596c0dd327ca29 Mon Sep 17 00:00:00 2001 From 03d67fdc4e326c291edce8d26e66146c8d1dd111 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 18 Mar 2018 11:43:30 -0400 Date: Sun, 18 Mar 2018 11:43:30 -0400
Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent

View file

@ -1,4 +1,4 @@
From cbeaccc81b0cf819614ee7f57c7ec2f63aa3477f Mon Sep 17 00:00:00 2001 From e983285e16c5833593ce8aaa6f806219cc08a641 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net> From: Minecrell <minecrell@minecrell.net>
Date: Wed, 11 Oct 2017 15:55:38 +0200 Date: Wed, 11 Oct 2017 15:55:38 +0200
Subject: [PATCH] Add extended PaperServerListPingEvent Subject: [PATCH] Add extended PaperServerListPingEvent

View file

@ -1,4 +1,4 @@
From dff56416f41aa3ed9bfe8eb38174279b2c189ac4 Mon Sep 17 00:00:00 2001 From f2bc9bc75a61d71a627a18f57f66a965ba99f1c3 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 18 Mar 2018 12:28:55 -0400 Date: Sun, 18 Mar 2018 12:28:55 -0400
Subject: [PATCH] Player.setPlayerProfile API Subject: [PATCH] Player.setPlayerProfile API

View file

@ -1,4 +1,4 @@
From 9a6d0e5ca85f0cc9a82b7eaa2dc4435cffc6c3d7 Mon Sep 17 00:00:00 2001 From 4f4d3dad507842141ff628337284fdd59deb9ab8 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 22 Mar 2018 01:39:28 -0400 Date: Thu, 22 Mar 2018 01:39:28 -0400
Subject: [PATCH] getPlayerUniqueId API Subject: [PATCH] getPlayerUniqueId API

View file

@ -1,4 +1,4 @@
From 9889b9a859949be8666d55e15aeff843c5a80d2b Mon Sep 17 00:00:00 2001 From 1a2033967ffb93634c6d4cd0af4e9d27d5d27b6e Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net> From: Minecrell <minecrell@minecrell.net>
Date: Wed, 11 Oct 2017 19:30:20 +0200 Date: Wed, 11 Oct 2017 19:30:20 +0200
Subject: [PATCH] Add legacy ping support to PaperServerListPingEvent Subject: [PATCH] Add legacy ping support to PaperServerListPingEvent

View file

@ -1,4 +1,4 @@
From c8afd6a6b8a7485805ed3eab9cd3b5faf59f6b28 Mon Sep 17 00:00:00 2001 From 82828abda963ddcea2a0df4c15a8f0d3bb2f20c8 Mon Sep 17 00:00:00 2001
From: Mark Vainomaa <mikroskeem@mikroskeem.eu> From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
Date: Sun, 1 Apr 2018 02:28:43 +0300 Date: Sun, 1 Apr 2018 02:28:43 +0300
Subject: [PATCH] Add method to open already placed sign Subject: [PATCH] Add method to open already placed sign

View file

@ -1,4 +1,4 @@
From df28e17f5f2d148f78f8ae0c03a3a7b51da7b081 Mon Sep 17 00:00:00 2001 From f4043d993253dd4c573166dd6cc91347bf85bbcf Mon Sep 17 00:00:00 2001
From: Kyle Wood <demonwav@gmail.com> From: Kyle Wood <demonwav@gmail.com>
Date: Thu, 1 Mar 2018 19:37:52 -0600 Date: Thu, 1 Mar 2018 19:37:52 -0600
Subject: [PATCH] Add version history to version command Subject: [PATCH] Add version history to version command

View file

@ -1,4 +1,4 @@
From 78be1ecf7b7a0c39cef11e710ab52f7257805913 Mon Sep 17 00:00:00 2001 From 6514d05e7994ca64d84829f5ea5f08881d896143 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sat, 28 Apr 2018 10:28:50 -0400 Date: Sat, 28 Apr 2018 10:28:50 -0400
Subject: [PATCH] Add Ban Methods to Player Objects Subject: [PATCH] Add Ban Methods to Player Objects

View file

@ -1,4 +1,4 @@
From a76bc604a4fc380fd9fbadf1c30959c6724bc8e0 Mon Sep 17 00:00:00 2001 From f6de564e86fa93c0f80a7f13fea4c725fde220a7 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 30 Apr 2018 13:14:30 -0400 Date: Mon, 30 Apr 2018 13:14:30 -0400
Subject: [PATCH] EndermanEscapeEvent Subject: [PATCH] EndermanEscapeEvent

View file

@ -1,4 +1,4 @@
From ae31d989fe8cdbe48cb5f36db3e9fd7e1a913a97 Mon Sep 17 00:00:00 2001 From 1ec75ba436761bb918589563fcd3b71d19846ce0 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 30 Apr 2018 13:29:15 -0400 Date: Mon, 30 Apr 2018 13:29:15 -0400
Subject: [PATCH] Enderman.teleportRandomly() Subject: [PATCH] Enderman.teleportRandomly()

View file

@ -1,4 +1,4 @@
From 5dbaacdda092901a3fbc3dc89d42fa53f9869cfe Mon Sep 17 00:00:00 2001 From 684b4b13045cf9a8ed1c8246539feb43afd55cee Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 30 Apr 2018 17:55:28 -0400 Date: Mon, 30 Apr 2018 17:55:28 -0400
Subject: [PATCH] Additional world.getNearbyEntities API's Subject: [PATCH] Additional world.getNearbyEntities API's
@ -6,7 +6,7 @@ Subject: [PATCH] Additional world.getNearbyEntities API's
Provides more methods to get nearby entities, and filter by types and predicates Provides more methods to get nearby entities, and filter by types and predicates
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 4cc70326..97badc63 100644 index e14098fa..ac32195d 100644
--- a/src/main/java/org/bukkit/World.java --- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java
@@ -2,11 +2,14 @@ package org.bukkit; @@ -2,11 +2,14 @@ package org.bukkit;
@ -24,7 +24,7 @@ index 4cc70326..97badc63 100644
import org.bukkit.block.Biome; import org.bukkit.block.Biome;
import org.bukkit.block.Block; import org.bukkit.block.Block;
@@ -503,6 +506,205 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -431,6 +434,205 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/ */
public Collection<Entity> getEntitiesByClasses(Class<?>... classes); public Collection<Entity> getEntitiesByClasses(Class<?>... classes);

View file

@ -1,4 +1,4 @@
From 35e2de767d021fbac9df464ada1422955342bfd6 Mon Sep 17 00:00:00 2001 From 5d998b54fbc373ae8d50dd5c19ddb64cd5db3e2c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 30 Apr 2018 19:27:31 -0400 Date: Mon, 30 Apr 2018 19:27:31 -0400
Subject: [PATCH] Location.isChunkLoaded() API Subject: [PATCH] Location.isChunkLoaded() API

View file

@ -1,4 +1,4 @@
From c6a4a37ea77dbc070c7c5297f41a2331a519968a Mon Sep 17 00:00:00 2001 From 16fae4609fea741833ed1b7936b260fc18628cee Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 29 Aug 2017 23:58:48 -0400 Date: Tue, 29 Aug 2017 23:58:48 -0400
Subject: [PATCH] Expand World.spawnParticle API and add Builder Subject: [PATCH] Expand World.spawnParticle API and add Builder
@ -410,10 +410,10 @@ index 4d0acaf5..0ae85d85 100644
* Options which can be applied to redstone dust particles - a particle * Options which can be applied to redstone dust particles - a particle
* color and size. * color and size.
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 97badc63..a22e47ea 100644 index ac32195d..d2b3e192 100644
--- a/src/main/java/org/bukkit/World.java --- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java
@@ -1744,7 +1744,31 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -1672,7 +1672,31 @@ public interface World extends PluginMessageRecipient, Metadatable {
* the type of this depends on {@link Particle#getDataType()} * the type of this depends on {@link Particle#getDataType()}
* @param <T> Type * @param <T> Type
*/ */

View file

@ -1,4 +1,4 @@
From 954a377e0960f18820e9ef8a3098d5f0358a284d Mon Sep 17 00:00:00 2001 From 6c6a2ce230f36f7b42b89b2ba7be407dc28c3a3c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 1 May 2018 20:17:44 -0400 Date: Tue, 1 May 2018 20:17:44 -0400
Subject: [PATCH] EndermanAttackPlayerEvent Subject: [PATCH] EndermanAttackPlayerEvent

View file

@ -1,4 +1,4 @@
From 9e505b4488cc6cb5a94d213092c949a2895c7cad Mon Sep 17 00:00:00 2001 From 7fde4c2352b99a7f57694bdae89f691ecc656c68 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 1 May 2018 21:33:35 -0400 Date: Tue, 1 May 2018 21:33:35 -0400
Subject: [PATCH] Close Plugin Class Loaders on Disable Subject: [PATCH] Close Plugin Class Loaders on Disable

View file

@ -1,4 +1,4 @@
From be2efe30ca0ea347d901f873e416d2e9b4973156 Mon Sep 17 00:00:00 2001 From aad0ca777756d4b341f053bd70ffce06d04b3206 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 16 May 2018 20:26:16 -0400 Date: Wed, 16 May 2018 20:26:16 -0400
Subject: [PATCH] WitchConsumePotionEvent Subject: [PATCH] WitchConsumePotionEvent

View file

@ -1,4 +1,4 @@
From 4b9da1b2e0d668e73dba9a673984af7d0be648cd Mon Sep 17 00:00:00 2001 From 541ae193668500d017ebe33cda73a44121ee3455 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 16 May 2018 20:39:09 -0400 Date: Wed, 16 May 2018 20:39:09 -0400
Subject: [PATCH] WitchThrowPotionEvent Subject: [PATCH] WitchThrowPotionEvent

View file

@ -1,4 +1,4 @@
From fedd7fd91d2e697183c38f16f58ba29791a4ab28 Mon Sep 17 00:00:00 2001 From a6bcc9478c95e056ec412ed1317f4d597b0a7017 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 24 May 2018 21:01:13 -0400 Date: Thu, 24 May 2018 21:01:13 -0400
Subject: [PATCH] Location.toBlockLocation/toCenterLocation() Subject: [PATCH] Location.toBlockLocation/toCenterLocation()

View file

@ -1,4 +1,4 @@
From c6aee3dcccadea3bd3d205b5a57976282695ffd6 Mon Sep 17 00:00:00 2001 From cc7e0cbb65f4290788d5f4864898611eb01d38ca Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 3 Jun 2018 04:10:13 -0400 Date: Sun, 3 Jun 2018 04:10:13 -0400
Subject: [PATCH] PotionEffect clone methods Subject: [PATCH] PotionEffect clone methods

View file

@ -1,4 +1,4 @@
From 22191113338e641960b5fa666940463514f187cb Mon Sep 17 00:00:00 2001 From aa70385f1487c465957bf670526c427fe9a31f57 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 5 Jun 2018 22:47:08 -0400 Date: Tue, 5 Jun 2018 22:47:08 -0400
Subject: [PATCH] WitchReadyPotionEvent Subject: [PATCH] WitchReadyPotionEvent

Some files were not shown because too many files have changed in this diff Show more