SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated Upstream (Bukkit/CraftBukkit/Spigot)

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

Please note that this build includes changes to meet upstreams
requirements for nullability annotations. While we aim for a level of
accuracy, these might not be 100% correct, if there are any issues,
please speak to us on discord, or open an issue on the tracker to
discuss.

Bukkit Changes:
9a6a1de3 Remove nullability annotations from enum constructors
3f0591ea SPIGOT-2540: Add nullability annotations to entire Bukkit API

CraftBukkit Changes:
8d8475fc SPIGOT-4666: Force parameter in HumanEntity#sleep
8b1588e2 Fix ExplosionPrimeEvent#setFire not working with EnderCrystals
39a287b7 Don't ignore newlines in PlayerListHeader/Footer

Spigot Changes:
cf694d87 Add nullability annotations
This commit is contained in:
Shane Freeder
2019-03-20 00:28:15 +00:00
parent 2b722719b3
commit a7ba5db3de
260 changed files with 2328 additions and 2021 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Spigot-API-Patches/Improve-death-events.patch
View File

@@ -15,10 +15,15 @@ items and experience which is otherwise only properly possible by using
internal code.
diff --git a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
index ab9e81fd..fef134c6 100644
index a5984ab06..e19a3df9a 100644
--- a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
@@ -0,0 +0,0 @@ import org.bukkit.inventory.ItemStack;
@@ -0,0 +0,0 @@ import org.bukkit.entity.LivingEntity;
import org.bukkit.event.HandlerList;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Thrown whenever a LivingEntity dies
*/
@@ -31,13 +36,13 @@ index ab9e81fd..fef134c6 100644
+ private boolean cancelled;
+ private double reviveHealth = 0;
+ private boolean shouldPlayDeathSound;
+ private org.bukkit.Sound deathSound;
+ private org.bukkit.SoundCategory deathSoundCategory;
+ @Nullable private org.bukkit.Sound deathSound;
+ @Nullable private org.bukkit.SoundCategory deathSoundCategory;
+ private float deathSoundVolume;
+ private float deathSoundPitch;
+ // Paper end
public EntityDeathEvent(final LivingEntity entity, final List<ItemStack> drops) {
public EntityDeathEvent(@NotNull final LivingEntity entity, @NotNull final List<ItemStack> drops) {
this(entity, drops, 0);
@@ -0,0 +0,0 @@ public class EntityDeathEvent extends EntityEvent {
public static HandlerList getHandlerList() {
@@ -104,6 +109,7 @@ index ab9e81fd..fef134c6 100644
+ *
+ * @return The sound that the entity makes
+ */
+ @Nullable
+ public org.bukkit.Sound getDeathSound() {
+ return deathSound;
+ }
@@ -113,7 +119,7 @@ index ab9e81fd..fef134c6 100644
+ *
+ * @param sound The sound that the entity should make when dying
+ */
+ public void setDeathSound(org.bukkit.Sound sound) {
+ public void setDeathSound(@Nullable org.bukkit.Sound sound) {
+ deathSound = sound;
+ }
+
@@ -122,6 +128,7 @@ index ab9e81fd..fef134c6 100644
+ *
+ * @return The sound category
+ */
+ @Nullable
+ public org.bukkit.SoundCategory getDeathSoundCategory() {
+ return deathSoundCategory;
+ }
@@ -131,7 +138,7 @@ index ab9e81fd..fef134c6 100644
+ *
+ * @param soundCategory The sound category
+ */
+ public void setDeathSoundCategory(org.bukkit.SoundCategory soundCategory) {
+ public void setDeathSoundCategory(@Nullable org.bukkit.SoundCategory soundCategory) {
+ this.deathSoundCategory = soundCategory;
+ }
+