Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
b999860d SPIGOT-2304: Add LootGenerateEvent

CraftBukkit Changes:
77fd87e4 SPIGOT-2304: Implement LootGenerateEvent
a1a705ee SPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent
41712edd SPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
This commit is contained in:
Aikar 2020-05-01 18:03:47 -04:00
parent a6a197b11f
commit 57dd397155
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
699 changed files with 1945 additions and 1938 deletions

View File

@ -1,11 +1,11 @@
From 2b5e59d5fc6cb5073abf121c11010c2f16787f2b Mon Sep 17 00:00:00 2001 From 5f6c18daf8f095f2f60a38998cfcb0ee28d0e8ef Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 00:16:08 +0100 Date: Tue, 1 Mar 2016 00:16:08 +0100
Subject: [PATCH] POM changes Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 186405ba..9975ba9a 100644 index 186405ba1..9975ba9ae 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -2,34 +2,28 @@ @@ -2,34 +2,28 @@
@ -120,5 +120,5 @@ index 186405ba..9975ba9a 100644
<shadedArtifactAttached>true</shadedArtifactAttached> <shadedArtifactAttached>true</shadedArtifactAttached>
</configuration> </configuration>
-- --
2.26.1 2.26.2

View File

@ -1,4 +1,4 @@
From 747cc281e224953dc859384efe4466cb165a90ef Mon Sep 17 00:00:00 2001 From 978cc75c386e674edf105135d3a558803c630393 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 1 Apr 2016 00:02:47 -0400 Date: Fri, 1 Apr 2016 00:02:47 -0400
Subject: [PATCH] Add FastUtil to Bukkit Subject: [PATCH] Add FastUtil to Bukkit
@ -6,7 +6,7 @@ Subject: [PATCH] Add FastUtil to Bukkit
Doesn't expose to plugins, just allows Paper-API to use it for optimization Doesn't expose to plugins, just allows Paper-API to use it for optimization
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index ce09baeab..3cfbff14b 100644 index 9975ba9ae..e8d9982bd 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -49,6 +49,12 @@ @@ -49,6 +49,12 @@
@ -23,5 +23,5 @@ index ce09baeab..3cfbff14b 100644
<groupId>commons-lang</groupId> <groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId> <artifactId>commons-lang</artifactId>
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From d7f401b6507cf6813a6e17cd0ad3df6d35d3a9e7 Mon Sep 17 00:00:00 2001 From 9941a3d6ebbd8e1c89d8cddc53c81a9e3e14111f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sat, 23 Feb 2019 11:26:21 -0500 Date: Sat, 23 Feb 2019 11:26:21 -0500
Subject: [PATCH] Paper Utils Subject: [PATCH] Paper Utils
@ -27,5 +27,5 @@ index 000000000..9db0056ab
+ +
+} +}
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 1765e5585c2c52e2ea84b77aeaeccef7c5e4192e Mon Sep 17 00:00:00 2001 From b5043839f6c38e559c6029dd6d47979dfce48d83 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 18:48:17 -0600 Date: Mon, 29 Feb 2016 18:48:17 -0600
Subject: [PATCH] Timings v2 Subject: [PATCH] Timings v2
@ -4091,5 +4091,5 @@ index 44badfedc..3cbe5c2bb 100644
+ +
} }
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From f09bdcb55acc96a1cf4000e915a77b81497de271 Mon Sep 17 00:00:00 2001 From 57863f551ef2baa2f507d9ab44b321548127e6b4 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com> From: Jedediah Smith <jedediah@silencegreys.com>
Date: Mon, 29 Feb 2016 17:22:34 -0600 Date: Mon, 29 Feb 2016 17:22:34 -0600
Subject: [PATCH] Player affects spawning API Subject: [PATCH] Player affects spawning API
@ -32,5 +32,5 @@ index bfbe775fc..41cb8b377 100644
* Update the list of commands sent to the client. * Update the list of commands sent to the client.
* <br> * <br>
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 38341660e29303cac1ddb8398e367c30309d0392 Mon Sep 17 00:00:00 2001 From 8f5b30551af6b64ae50e49b7c46d754cfc06ffa5 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 17:24:57 -0600 Date: Mon, 29 Feb 2016 17:24:57 -0600
Subject: [PATCH] Add getTPS method Subject: [PATCH] Add getTPS method
@ -48,5 +48,5 @@ index fad4e9292..f0dba56dc 100644
* Get the advancement specified by this key. * Get the advancement specified by this key.
* *
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From fe1924a542c1c342b0c6d8e83c026b6f608216dc Mon Sep 17 00:00:00 2001 From 0fad6352b060486f735ee07c5d5fc55c2cb67351 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
@ -66,5 +66,5 @@ index 5a8789324..3022b4a27 100644
+ } + }
} }
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From eb32e3f7a1965a7b973da5155617dc917201793b Mon Sep 17 00:00:00 2001 From 80c67d85cde46ffd7331e67ea1ccc4697a69d2ce Mon Sep 17 00:00:00 2001
From: Zach Brown <zach@zachbr.io> From: Zach Brown <zach@zachbr.io>
Date: Mon, 27 May 2019 01:10:06 -0500 Date: Mon, 27 May 2019 01:10:06 -0500
Subject: [PATCH] Version Command 2.0 Subject: [PATCH] Version Command 2.0
@ -176,5 +176,5 @@ index cbce52444..0486abd19 100644
try { try {
BufferedReader reader = Resources.asCharSource( BufferedReader reader = Resources.asCharSource(
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From a986444a1c2cce777677717b45e92227b9c9e192 Mon Sep 17 00:00:00 2001 From 643904b85838b4e2467b141e3302e90d8e32d1f4 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 000000000..29dd763a9
+ } + }
+} +}
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 893176893dceda54d5679ae1c52bddc6e44d2068 Mon Sep 17 00:00:00 2001 From f135c9a8ce4932a9e7959e1b37523bb80fe444cc 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
@ -30,5 +30,5 @@ index 41cb8b377..a985431e5 100644
/** /**
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 2aa65d30322969ef1977dfbb7e972747b19e6398 Mon Sep 17 00:00:00 2001 From ad5e2c1dff96cd282de8d908b8d35a90b04daf29 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
@ -97,5 +97,5 @@ index 000000000..978813b94
+ } + }
+} +}
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 42d1bc471b8c73b4b00d236ae4e45ee6982da101 Mon Sep 17 00:00:00 2001 From 19fc087b4ae7ad9562925fba66a2b5888a8be51e 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 00000000..8b1fdb9d index 000000000..8b1fdb9d2
--- /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,16 @@ @@ -0,0 +1,16 @@
@ -28,5 +28,5 @@ index 00000000..8b1fdb9d
+ } + }
+} +}
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 62da1f0f47b50b3fc2004268c2da2523d7d5817a Mon Sep 17 00:00:00 2001 From 4d288db916b66cbdea9482b224e4a0e39764765a 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
@ -20,5 +20,5 @@ index 50a51394f..5cc37eeed 100644
// Perhaps abort here, rather than continue going, but as it stands, // Perhaps abort here, rather than continue going, but as it stands,
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 5d59f9c5f1e3c3a4121cfe62acf8990497c5f23f Mon Sep 17 00:00:00 2001 From a8c8b3a84cd77647be69e7621118be44c2d8216a 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
@ -49,5 +49,5 @@ index f0dba56dc..af21bb1aa 100644
* Get the advancement specified by this key. * Get the advancement specified by this key.
* *
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 88db0ef7068bb5d1eb219c6185763ae53da38629 Mon Sep 17 00:00:00 2001 From a5c0d8758c2a44b94be4d8d868c1eac0b2f30e46 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
@ -111,5 +111,5 @@ index a985431e5..dd6adedb6 100644
* Forces an update of the player's entire inventory. * Forces an update of the player's entire inventory.
* *
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 6bac0b2cdf54dd3ded7833db7e3c36904df3e51c Mon Sep 17 00:00:00 2001 From f6c5314caaf3750d44dd2fa7362118ce38ddf2e9 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
@ -513,5 +513,5 @@ index dd6adedb6..3d07467a4 100644
/** /**
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 4510c1ac6e1ad5b0e111a39d9ae63c37bf751b46 Mon Sep 17 00:00:00 2001 From d4795bab801af08aaa07c753e5b16fe18401c5f8 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
@ -603,5 +603,5 @@ index c548911c4..9a5fe8ca4 100644
} }
} }
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From d55149dcb67c6bfd3e31d8fbc98345e02abf0175 Mon Sep 17 00:00:00 2001 From 3162dd0d7459bac922daf980c3da224efdbee977 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
@ -26,5 +26,5 @@ index 46b119017..05167fb34 100644
public ServerEvent(boolean isAsync) { public ServerEvent(boolean isAsync) {
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 8ae5dc71f1abb6e3a32e468bde32e1783b510380 Mon Sep 17 00:00:00 2001 From 313da29d469b333104e1e6e5f0053a9f80f5c2d9 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,5 +40,5 @@ index a9020ecc7..d3b3a8bf9 100644
+ // Paper end + // Paper end
} }
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 18d38fdbc6aa79a3105ee7197bfc386a6a46db71 Mon Sep 17 00:00:00 2001 From 33cd6ad8726b16cc04108d438d653657726c03a5 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
@ -29,5 +29,5 @@ index 203d135f1..52541e496 100644
+ // Paper end + // Paper end
} }
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 1f8c16b78f72d2da23b0c5c15886d3f467e1480f Mon Sep 17 00:00:00 2001 From 3a2cee7866bd2596f7c7b43bc49f547afb68598c 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
@ -119,5 +119,5 @@ index b98195650..4c2102a11 100644
* Gets the status of this pack. * Gets the status of this pack.
* *
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From a1eaf7d5b1995612788c21b799931fd7af0fa46c Mon Sep 17 00:00:00 2001 From 2224d91ab552d71eb43c7d8c047c8a90d7e5765f 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.
@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors.
Uses method handles for private or static methods. Uses method handles for private or static methods.
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index e8d9982b..661d109f 100644 index e8d9982bd..661d109f7 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -128,6 +128,17 @@ @@ -128,6 +128,17 @@
@ -29,7 +29,7 @@ index e8d9982b..661d109f 100644
<build> <build>
diff --git a/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java diff --git a/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
new file mode 100644 new file mode 100644
index 00000000..5b28e9b1 index 000000000..5b28e9b1d
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java +++ b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
@@ -0,0 +1,42 @@ @@ -0,0 +1,42 @@
@ -77,7 +77,7 @@ index 00000000..5b28e9b1
+} +}
diff --git a/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java diff --git a/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
new file mode 100644 new file mode 100644
index 00000000..c8367242 index 000000000..c83672427
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java +++ b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
@@ -0,0 +1,43 @@ @@ -0,0 +1,43 @@
@ -126,7 +126,7 @@ index 00000000..c8367242
+} +}
diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
new file mode 100644 new file mode 100644
index 00000000..b6e7d8ee index 000000000..b6e7d8ee8
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
@@ -0,0 +1,47 @@ @@ -0,0 +1,47 @@
@ -179,7 +179,7 @@ index 00000000..b6e7d8ee
+} +}
diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
new file mode 100644 new file mode 100644
index 00000000..beed9e6e index 000000000..beed9e6e0
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
@@ -0,0 +1,35 @@ @@ -0,0 +1,35 @@
@ -220,7 +220,7 @@ index 00000000..beed9e6e
+} +}
diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
new file mode 100644 new file mode 100644
index 00000000..ac99477e index 000000000..ac99477e9
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
@@ -0,0 +1,66 @@ @@ -0,0 +1,66 @@
@ -292,7 +292,7 @@ index 00000000..ac99477e
+} +}
diff --git a/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java diff --git a/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java
new file mode 100644 new file mode 100644
index 00000000..72e48e8e index 000000000..72e48e8ef
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java +++ b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java
@@ -0,0 +1,35 @@ @@ -0,0 +1,35 @@
@ -332,7 +332,7 @@ index 00000000..72e48e8e
+ } + }
+} +}
diff --git a/src/main/java/org/bukkit/plugin/EventExecutor.java b/src/main/java/org/bukkit/plugin/EventExecutor.java diff --git a/src/main/java/org/bukkit/plugin/EventExecutor.java b/src/main/java/org/bukkit/plugin/EventExecutor.java
index a850f078..9026e108 100644 index a850f0780..9026e108c 100644
--- a/src/main/java/org/bukkit/plugin/EventExecutor.java --- a/src/main/java/org/bukkit/plugin/EventExecutor.java
+++ b/src/main/java/org/bukkit/plugin/EventExecutor.java +++ b/src/main/java/org/bukkit/plugin/EventExecutor.java
@@ -5,9 +5,75 @@ import org.bukkit.event.EventException; @@ -5,9 +5,75 @@ import org.bukkit.event.EventException;
@ -412,7 +412,7 @@ index a850f078..9026e108 100644
+ // Paper end + // Paper end
} }
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index 5cc37eee..e72cbde4 100644 index 5cc37eeed..e72cbde4b 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -300,21 +300,7 @@ public final class JavaPluginLoader implements PluginLoader { @@ -300,21 +300,7 @@ public final class JavaPluginLoader implements PluginLoader {
@ -439,5 +439,5 @@ index 5cc37eee..e72cbde4 100644
eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled())); eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
} else { } else {
-- --
2.26.1 2.26.2

View File

@ -1,4 +1,4 @@
From da27772114ec79eb988549a347bc9b29c2e5e1da Mon Sep 17 00:00:00 2001 From edbedec7fd2d9d2b495d81f52c8662429eb2937d 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
@ -33,5 +33,5 @@ index 18d0636b7..8ec56cd6b 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.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From c0bad2b238c1d7e452039c10b683dc3075376a4c Mon Sep 17 00:00:00 2001 From 76eaf0d523ba97558aa23fd1b744d9e70c9978d4 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 a6ad94ef9..9d4f553c0 100644
while (index != -1) { while (index != -1) {
int start = index; int start = index;
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From f0b316740a9ee295791f79099821d953aa2d11c4 Mon Sep 17 00:00:00 2001 From 4397b5e0ac84c2dca83409fb9f989bdc4827d687 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
@ -103,5 +103,5 @@ index 9a5fe8ca4..8ddaf9c2e 100644
+ +
} }
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From e9241513c3d597d3dd268f27a6900f94f094c092 Mon Sep 17 00:00:00 2001 From f628305272a0df52727e9e2db61307dc76cf2762 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
@ -47,5 +47,5 @@ index c2793f3ef..373f4b5b5 100644
public boolean isCancelled() { public boolean isCancelled() {
return this.isCancelled; return this.isCancelled;
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 05ae91f7ee31917b7918702d1ebbf81b19243d03 Mon Sep 17 00:00:00 2001 From f83b3e198ebdba89a0ba5c66abf0c46fe2069780 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
@ -33,5 +33,5 @@ index 88ce9dc6b..96916ec95 100644
+ // Paper end + // Paper end
} }
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 7a1354a251ad7d78f0a7f56d94d051e30fcc9a9a Mon Sep 17 00:00:00 2001 From 2c51cf61112a37b8ac0e8d50d54f097b0ad72924 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
@ -78,5 +78,5 @@ index 000000000..e5dbbd660
+ } + }
+} +}
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 2ddd503b8812a66fa419df04733b2924fb794a0b Mon Sep 17 00:00:00 2001 From a8bad8e3690285d16bd45408d20ec035ce9f6aaf 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
@ -94,5 +94,5 @@ index 000000000..63e46b2fb
+ } + }
+} +}
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From dfbeeeb5128994e0561f8b803688603e2e0ea8e3 Mon Sep 17 00:00:00 2001 From da9edaf6bd9b18c3772b3fda4d338ffbc4453cad 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
@ -89,5 +89,5 @@ index baf850226..d363d517c 100644
for (Map<Plugin, MetadataValue> values : metadataMap.values()) { for (Map<Plugin, MetadataValue> values : metadataMap.values()) {
if (values.containsKey(owningPlugin)) { if (values.containsKey(owningPlugin)) {
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 091dd579f3b4f7cc79e53b67278eb3fb6a1e6230 Mon Sep 17 00:00:00 2001 From 2b5c599b3684a15bdcd52ec6d182c9f5cef13ca1 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)
@ -45,5 +45,5 @@ index d363d517c..abbe545af 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.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 8ac6eed2974264699f48da9eafb488bc5f9504ab Mon Sep 17 00:00:00 2001 From d54f8dbd0a40ad129a03b27a1f96d66799559f34 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
@ -57,5 +57,5 @@ index 000000000..09cfdf48e
+ } + }
+} +}
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From f99266e0f58c1e678b0947bb7f8e043464e83591 Mon Sep 17 00:00:00 2001 From 219ff12a40896c0bd14c1242dab3518e34a95941 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
@ -234,5 +234,5 @@ index 000000000..f0bb4e31c
+ } + }
+} +}
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 9b6b76c82b9ea8b2ac5a9994b7404972c653eb73 Mon Sep 17 00:00:00 2001 From bc0b8a53cb6ce795d2ce85037c432db3c464de4a 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 88cebc004..b2bf62a50 100644
+ // Paper end + // Paper end
} }
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 9ab9b353c9a76455567a474ce06c2916d7789d75 Mon Sep 17 00:00:00 2001 From 08eb4769f3ce11fe64a2d8863825a28bd9f815cb 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 8feb6698f..d51d2ec1d 100644
/** /**
* Gets the amount of regained health * Gets the amount of regained health
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From f8f1bbee15cabfe54253a4a7e50ee687ebe3694c Mon Sep 17 00:00:00 2001 From cdc55d7f84c7f4886cf773712bfa3fd73699146d 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
@ -401,5 +401,5 @@ index 24a3d989d..901db8524 100644
* Set the seed used when this Loot Table generates loot. * Set the seed used when this Loot Table generates loot.
* *
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 3e509ef8019f3efe28e265dbbbdae31c3f23d235 Mon Sep 17 00:00:00 2001 From 8a1e728b8f151cf52deba5f2b7bee3ac0c2123a2 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
@ -122,5 +122,5 @@ index 0e0ed93b5..d3949edfc 100644
+ // Paper end + // Paper end
} }
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 559959380fa34db1acd3b167e05bafb17b89e8f4 Mon Sep 17 00:00:00 2001 From eed23f7813660a542d1e563760e41a1d21e58ed5 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
@ -45,5 +45,5 @@ index 000000000..5bb677ce5
+ } + }
+} +}
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From c841a774495970964d668cc65c0715e84f43e951 Mon Sep 17 00:00:00 2001 From d911fa59c930a36aa9c0ca24f9741fdedfecc6cb 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
@ -99,5 +99,5 @@ index c62da4131..af8ab73fe 100644
confirmed = true; confirmed = true;
} else { } else {
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From d021eefa33645c6ad7cb1bf140a9f7602ccc6704 Mon Sep 17 00:00:00 2001 From 6d38fdc5d943c374318c7d0d3c008d6b21b5ffdb 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
@ -53,5 +53,5 @@ index c99c9281e..7c340f539 100644
* Get the amount of experience the player will receive * Get the amount of experience the player will receive
* *
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 09ab884e22c0b5d6b658c1fb2b9f98b711cd2b7d Mon Sep 17 00:00:00 2001 From c2bf88392dc9ba74ccce743f0d123b7004a4bd7d 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
@ -78,5 +78,5 @@ index 000000000..453663893
+ } + }
+} +}
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 81e518a15896393670d465674c981237f381c4dc Mon Sep 17 00:00:00 2001 From 282612278f301da5f16d3002c7d0cd7ecd782c3a 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
@ -72,5 +72,5 @@ index 9e62987cb..6f3ab730b 100644
throw new UnsupportedOperationException("Not supported yet."); throw new UnsupportedOperationException("Not supported yet.");
} }
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 16cad21ec53a8899e2579841f235ee51c62052ce Mon Sep 17 00:00:00 2001 From 0c1b09b9ee6b8ba923f4fd36c8f55d3997ecc931 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 beeba55d5..6a854d7cf 100644
+ // Paper end + // Paper end
} }
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 95814d0fc19ff644b9d7c04a93a16ec96b3c5b6a Mon Sep 17 00:00:00 2001 From 1069406de4f5ebc7905a30f3bce3af03fb08560c 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
@ -84,5 +84,5 @@ index 000000000..37a17f0bb
+ } + }
+} +}
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 98d25e5120b1967d9983edeb20d952bb16104c87 Mon Sep 17 00:00:00 2001 From 9189d92918b4203b4ee8a958a6705df801585371 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
@ -37,5 +37,5 @@ index f844d5aa9..e8c04c138 100644
+ // Paper end + // Paper end
} }
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 0e0e72ef0da87fb3a9de37e049181261b1563ade Mon Sep 17 00:00:00 2001 From 6142445c0581fffa4484fd3ddc164249a3736687 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
@ -41,5 +41,5 @@ index 000000000..b64ab6eec
+ } + }
+} +}
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From df2cbfd4b45e1d99861b99775717e8bb65521555 Mon Sep 17 00:00:00 2001 From 06a8a84c8126ecf97e19d1d791193145bef997fe 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
@ -45,5 +45,5 @@ index cd8a09576..808c3b4a4 100644
* Gets the {@link Block} at the given coordinates * Gets the {@link Block} at the given coordinates
* *
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From a4e43288167984c868f8d3c62aab633fb1f8ae78 Mon Sep 17 00:00:00 2001 From fa3d1079346548c18f824021facbd8b3be7c1538 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
@ -121,5 +121,5 @@ index c286edfd8..dec70bbfa 100644
+ // Paper end + // Paper end
} }
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 8eb2d55c1b5aa53889b24064e59c13684dc9d0e9 Mon Sep 17 00:00:00 2001 From 665f136673ecc680de23316c9d1430607813e6ef 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
@ -28,5 +28,5 @@ index 7e8f5649c..afb7b136b 100644
+ // Paper end + // Paper end
} }
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 57dfe41e0fe5f7f191d659a8f17525d507024ec0 Mon Sep 17 00:00:00 2001 From 990bcb6c18176695797928e6300d34a593334e10 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
@ -58,5 +58,5 @@ index 7f153000e..1e126487d 100644
} }
return completions; return completions;
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 5281507980d4dadb00b963312e8f5056f9671d81 Mon Sep 17 00:00:00 2001 From 3d9d0d5e65508966103b499734e6c63b0a8701d2 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
@ -192,5 +192,5 @@ index 1b2267f4e..1a58734d9 100644
return to; return to;
} }
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From e577358b94c9b069218f40f2eea0b5156b524549 Mon Sep 17 00:00:00 2001 From 208a37b615ef0eae1a0c61d55c4de61bac73f5c8 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 00c58c1d9..cb9e9f369 100644
+ // Paper end + // Paper end
} }
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 2f6600df7fdfa7b4d7a3110475814d2c2d72d27f Mon Sep 17 00:00:00 2001 From 1a7eb89294acf34a67835dfd7c2d62f638c42e19 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
@ -53,5 +53,5 @@ index 951ea2cc7..18d82c111 100644
@NotNull @NotNull
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From f5f3d8868eddd5a287febdd2f4ce1d62eac6122e Mon Sep 17 00:00:00 2001 From 5839439f0beb3bc136e34eb0d9c8358ebe74125f 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
@ -100,5 +100,5 @@ index 000000000..fb5cb3dc4
+ } + }
+} +}
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From c9b7dd5b35264329e3f69140fb8845e44bd1b251 Mon Sep 17 00:00:00 2001 From d601968fd5d4787245c961ce2abe9eba0803210b 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
@ -93,5 +93,5 @@ index 000000000..251342c3c
+} +}
+ +
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From ce40c2ae5ef2185bbe92984163dd404087d6141d Mon Sep 17 00:00:00 2001 From 64a0d3e11488bbbc2ed7c6ee90d664af630bec8d 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
@ -318,5 +318,5 @@ index 112098f9b..6778ac8e5 100644
// Paper end // Paper end
} }
-- --
2.25.1 2.26.2

View File

@ -1,11 +1,11 @@
From 22a941921b2b5577054bbc53d0d21adb7dba5877 Mon Sep 17 00:00:00 2001 From cd54dbd0385dc40f13519fcb7dda7d103dd0d6ee 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
diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
index a7f08bb1..3adff676 100644 index a7f08bb1c..3adff676c 100644
--- a/src/main/java/org/bukkit/entity/HumanEntity.java --- a/src/main/java/org/bukkit/entity/HumanEntity.java
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
@@ -324,6 +324,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder @@ -324,6 +324,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder

View File

@ -1,4 +1,4 @@
From ee60b16c81cd7ad8564d94a908c93eae2263973e Mon Sep 17 00:00:00 2001 From 4b6c042da9e923edd76bc5fdc607ed401d4ced08 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
@ -173,5 +173,5 @@ index 000000000..4dcf6242c
+ +
+} +}
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From cf40a09c3aafc120d4653b62ade05c18cf6574f6 Mon Sep 17 00:00:00 2001 From f4dcdb8703168366918c79b871d00e942add7170 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()
@ -22,5 +22,5 @@ index 4e4445d18..e2952209d 100644
// Paper end // Paper end
} }
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 550cd3e16b4c171704291fe55100ff9e3cdba55e Mon Sep 17 00:00:00 2001 From 869f1fac4b79043563dfa4625acdbabc613f7b9b 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
@ -82,5 +82,5 @@ index 000000000..7944f26a3
+ +
+public interface SaddledHorseInventory extends AbstractHorseInventory {} +public interface SaddledHorseInventory extends AbstractHorseInventory {}
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From ea049a06b4c2090fbf19ac3bf86bf2bc4662f49e Mon Sep 17 00:00:00 2001 From 0a9552614a67b3e8a3b3ef7b58933043fc799766 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
@ -62,5 +62,5 @@ index f70a6a22b..07aa65d1a 100644
+ // Paper end + // Paper end
} }
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 50e776a94f7520476e8899ecd8573b261c0fc06e Mon Sep 17 00:00:00 2001 From b62a22ca13ce778145dbc34dcdffe4813bc30c24 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
@ -51,5 +51,5 @@ index 07aa65d1a..e9ba31152 100644
// Paper end // Paper end
} }
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 60fe06db929a635f93e050456fa5e2e0800592c2 Mon Sep 17 00:00:00 2001 From 92673cadf67817aab73990289c74c27127703771 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
@ -131,5 +131,5 @@ index 000000000..b10176289
+ } + }
+} +}
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 2f10a17ee8ab17bebd10793c17d178d6800a973e Mon Sep 17 00:00:00 2001 From 45ec6aaac291417a79ebfad70ffb2c02b538914f 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
@ -58,5 +58,5 @@ index bcb576a42..a1071e317 100644
} }
} }
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 238ffac36922679c18effa5dc57ec213734e14a5 Mon Sep 17 00:00:00 2001 From 203d058aa3ed3a1b4217f821bc7c2ee6f6b266e2 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
@ -25,5 +25,5 @@ index 52541e496..ae712e76d 100644
* Adds the given {@link PotionEffect} to the living entity. * Adds the given {@link PotionEffect} to the living entity.
* *
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 34676ba4f3ae9ae7934cf80a78b2230f43d24941 Mon Sep 17 00:00:00 2001 From e51e0cbb38eebff56b8323f32a2d23b9207e3599 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
@ -40,5 +40,5 @@ index 223190054..bb2e55e97 100644
/** /**
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From ffef7f82e6a112395460bed64907a045656d685a Mon Sep 17 00:00:00 2001 From 6d58aa991616435bb4a469b890c068c73d1c0aa4 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
@ -14,7 +14,7 @@ it without having to shade it in the plugin and going through
several layers of logging abstraction. several layers of logging abstraction.
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 3712b70bc..2cb971408 100644 index 661d109f7..20c473f52 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -109,6 +109,13 @@ @@ -109,6 +109,13 @@
@ -50,5 +50,5 @@ index febfec6ef..79890c68f 100644
* Returns the name of the plugin. * Returns the name of the plugin.
* <p> * <p>
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 470028a790e67685c105a18098263915ec876864 Mon Sep 17 00:00:00 2001 From a2d273ffe8bf9ad5b9526c51085a868a9d1099ab 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
@ -116,5 +116,5 @@ index 36f542a85..3a02dbe9d 100644
} }
} }
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From c4ca332d0ca8e7faf24ebde6d024bfd7af31c49c Mon Sep 17 00:00:00 2001 From 0d1a83fae7d8aa0b04d3fcf518df34570be93c7b 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
@ -117,5 +117,5 @@ index 000000000..289a0d784
+ } + }
+} +}
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 0f31dba70d86efcce28be143cd14b9263b250295 Mon Sep 17 00:00:00 2001 From 133d45c9d35af37863373b0786ab52a73c1940cb 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
@ -70,5 +70,5 @@ index cb7d9f055..9398f303f 100644
/** /**
* Gets the "friendly" name to display of this player. This may include * Gets the "friendly" name to display of this player. This may include
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 3c8d83a02f90cdcadab5ab2b4caa858424ae992f Mon Sep 17 00:00:00 2001 From 23bde144450fd0412187276dbb2a6d6264f4216b 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
@ -148,5 +148,5 @@ index 000000000..2827a1002
+ } + }
+} +}
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From ece58ef4c7915ca83cad87704414c54bf251d3eb Mon Sep 17 00:00:00 2001 From b6e9fd15bac76fd7f37336a860f8139f33491a43 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
@ -30,5 +30,5 @@ index 8a48572e9..8154093df 100644
* Returns the biome that this block resides in * Returns the biome that this block resides in
* *
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From fadca523e626b46d425dc49ec7a52379c7ab963d Mon Sep 17 00:00:00 2001 From 52a46f26ad9a823843ef700a61b2c8f0eced2505 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
@ -265,5 +265,5 @@ index d1a9956a1..f96c4ba53 100644
@Override @Override
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From a05418027d1bbb6f2adaeef7fa06c19b2f9ca0fd Mon Sep 17 00:00:00 2001 From e04e67172c3c5ae3b4ce5fe1a899ae0f5c538f2a 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
@ -34,5 +34,5 @@ index 68447fb8c..84062dd71 100644
} }
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 71071c945004982e39bd9f02ca5dd1183b1f37e0 Mon Sep 17 00:00:00 2001 From 88833a36b967c46876edcd7c827f69d107b0441e 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
@ -92,5 +92,5 @@ index 000000000..f7beb22d5
+ } + }
+} +}
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 8ff1280282b3c67e3fb94958a9a9c4f4d6410faa Mon Sep 17 00:00:00 2001 From 6aa6f1d8373362d2388f8fd7268c9c69f579ee49 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
@ -101,5 +101,5 @@ index 000000000..0ce3e3977
+ } + }
+} +}
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From e52b092a351ea904e30208c752ac95425296416c Mon Sep 17 00:00:00 2001 From 79cdeb87be87e51812ecf9302e19d1e247492a34 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
@ -49,5 +49,5 @@ index 9398f303f..8a67375de 100644
/** /**
* Gives the player the amount of experience levels specified. Levels can * Gives the player the amount of experience levels specified. Levels can
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 51c2512ba9f95dbfd65b88b9fe21d56bde914c32 Mon Sep 17 00:00:00 2001 From b70880b6efa57cdc1bc10a32ff65d2bd8d2a9294 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
@ -125,5 +125,5 @@ index 000000000..d5edde9cd
+ } + }
+} +}
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From a33bd8275812e8768a043bc3f267fbf8ac6db744 Mon Sep 17 00:00:00 2001 From 4a8edbf79556ad5f288957d8876a9cdb60fb3693 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
@ -79,5 +79,5 @@ index 000000000..112a0dbf5
+ } + }
+} +}
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 9a1ede056ec1aba4f009706f545751ab7a6d40d5 Mon Sep 17 00:00:00 2001 From 9e8767f0b3b3f8515a1613e9a9bb9618ea430d25 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 setPlayerProfile API for Skulls Subject: [PATCH] Add setPlayerProfile API for Skulls
@ -77,5 +77,5 @@ index 35a392033..8b2465ea2 100644
* Gets the owner of the skull. * Gets the owner of the skull.
* *
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From a9c4c45122619d2ce3561c256614f4c81b893309 Mon Sep 17 00:00:00 2001 From 9389a54198096a32e5e1ff73b5a0d6effd4eec27 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
@ -175,5 +175,5 @@ index 000000000..021bc8631
+ } + }
+} +}
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 16e6184f6baaa78ed043b38ab35a19ddbd296c21 Mon Sep 17 00:00:00 2001 From 34cad9effb5ade48de65055b9afa0eb5aae8848c 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
@ -74,5 +74,5 @@ index 000000000..bb8d7c959
+ } + }
+} +}
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From a5fc188f4ae9a73cf2c391bbf684aba1220eb83d Mon Sep 17 00:00:00 2001 From ab0241468203214f22dbaf2b94d3a2f9a4b3ee30 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
@ -95,5 +95,5 @@ index 000000000..7e4acfff1
+ void setMarker(boolean marker); + void setMarker(boolean marker);
+} +}
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 6851eb5619af4d2f79884831812a779117402e7c Mon Sep 17 00:00:00 2001 From d697214b9114e19f04b5c2169f5d284da5675335 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
@ -38,5 +38,5 @@ index a8c48f5a4..04d4a83bf 100644
} }
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 6ee338de00379380b81ef00c5af09fa30dd640ae Mon Sep 17 00:00:00 2001 From 0a6d202f31be5d5d2ecc88702363b5a6b662afd4 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
@ -41,5 +41,5 @@ index 0c066bdfc..957a60167 100644
*/ */
@Nullable @Nullable
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 716f586dbbbef1b30c684d64ed58a19397aa6b70 Mon Sep 17 00:00:00 2001 From 713ad4df4e42006bb8e1fa624a12aefab732091a 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
@ -53,5 +53,5 @@ index c8384da69..6c09ea6c6 100644
this.message = ""; this.message = "";
this.name = name; this.name = name;
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 2ac81c41e0800c8bfe372eea825fbdcebfe7ed62 Mon Sep 17 00:00:00 2001 From 1f72e6ba6fe22b8a0d93ce86effc67d43320e59f 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
@ -369,5 +369,5 @@ index 612958a33..bb4f7702c 100644
+ // Paper end + // Paper end
} }
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From bde1364a51f6d9157b5f561df604031e8f830cf5 Mon Sep 17 00:00:00 2001 From e790f4bf31e991ec4696ceb8f2b1dc87bedcd903 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
@ -39,5 +39,5 @@ index 8a67375de..8fe402336 100644
// Spigot start // Spigot start
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 3af92ccbed37aa47009dc73c9e40f7d6db1e2255 Mon Sep 17 00:00:00 2001 From 3a9376909cd6ad2cd30d5f777cddb24a07d2c087 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
@ -57,5 +57,5 @@ index 6778ac8e5..11fffc514 100644
* Gets the plugin manager for interfacing with plugins. * Gets the plugin manager for interfacing with plugins.
* *
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 046c71d911ea7b1bdcd6f35fb3d5fa7f77d63384 Mon Sep 17 00:00:00 2001 From 22c3773a195302a193b2c3d53ca7336ad4a64b4f 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
@ -29,5 +29,5 @@ index 517d15238..ffda9f6a8 100644
+ +
} }
-- --
2.25.1 2.26.2

View File

@ -1,11 +1,11 @@
From 1a4b026170e3aca5fdeacbc8c2cd499e0cd339dd Mon Sep 17 00:00:00 2001 From ff1c8019060044851d060eb90f467f1b68506715 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
diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
index 3adff676..2d413d72 100644 index 3adff676c..2d413d720 100644
--- a/src/main/java/org/bukkit/entity/HumanEntity.java --- a/src/main/java/org/bukkit/entity/HumanEntity.java
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
@@ -468,4 +468,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder @@ -468,4 +468,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder

View File

@ -1,4 +1,4 @@
From eb23471f37a4e9f29ac12f2d92aa64fd30dfa758 Mon Sep 17 00:00:00 2001 From 2b909f379fdaf8b917ef577b5cf68a1960dd1b80 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
@ -252,5 +252,5 @@ index 8fe402336..c37d7fca0 100644
/** /**
* Sends an Action Bar message to the client. * Sends an Action Bar message to the client.
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From adcdedec7cd6db5eac2e0e059634490079f30d06 Mon Sep 17 00:00:00 2001 From de038a5328912aae8d9a936569c84dec095289ca 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
@ -101,5 +101,5 @@ index 000000000..806112a8b
+ } + }
+} +}
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 370964285ffa5b68ca08697985f394d4c91b6c79 Mon Sep 17 00:00:00 2001 From 773bba9d4c6528f8878b14ab85f3f4db73ece4ad 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()
@ -28,5 +28,5 @@ index bb325d9c8..821c690f8 100644
* Gets the id and data of the block that the Enderman is carrying. * Gets the id and data of the block that the Enderman is carrying.
* *
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 57cf333277477c1a6f7ac9b5fcf035b530841765 Mon Sep 17 00:00:00 2001 From 42a081572a8efbe94ed5f53b9f4f28dd92c9a775 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
@ -291,5 +291,5 @@ index 6c09ea6c6..76c4a1a6e 100644
*/ */
public void setPlayerProfile(@NotNull PlayerProfile profile) { public void setPlayerProfile(@NotNull PlayerProfile profile) {
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 6f24ef7d7b7146b9d2c032252b7866657b31c3a1 Mon Sep 17 00:00:00 2001 From 350b09c26418358e4b30679f7c35467491fc1dc3 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
@ -17,5 +17,5 @@ index 0939a8070..6c8b8eddc 100644
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (obj == null) { if (obj == null) {
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 77befc8808bf1a216fdae6060f9a19d5f0b36df0 Mon Sep 17 00:00:00 2001 From 336ac304c375b8aa1bc686c7594b2b4a39725d30 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
@ -578,5 +578,5 @@ index fbe7e76c0..085c7a42c 100644
/** /**
* Spawns the particle (the number of times specified by count) * Spawns the particle (the number of times specified by count)
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From d3004d7b163f83fe6e98647f03cdfe3a90d388ae Mon Sep 17 00:00:00 2001 From 3659aee2bdce6ddba260678e1cbd700fc9b11820 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
@ -115,5 +115,5 @@ index 000000000..f530a3d93
+ } + }
+} +}
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 69e017b9ea1d488c8d73dc1d2cbb55bab33dc917 Mon Sep 17 00:00:00 2001 From 26a891ffd609b62b8198ff3cfabca35afacf84bb 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
@ -140,5 +140,5 @@ index e72cbde4b..32ec68b48 100644
} }
} }
-- --
2.25.1 2.26.2

View File

@ -1,4 +1,4 @@
From 15909a0d10135b8cfa2062fb3df50d2277a10528 Mon Sep 17 00:00:00 2001 From 630e23c654223c31b4307999dd467b9ede7f501f 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
@ -121,5 +121,5 @@ index 000000000..6ef6367b6
+ } + }
+} +}
-- --
2.25.1 2.26.2

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