Updated Upstream (Bukkit/CraftBukkit/Spigot)

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

View File

@@ -21,7 +21,7 @@ this is going to be the best soultion all around.
Improvements/suggestions welcome!
diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
index 364451b5..b3269db2 100644
index 69c9e499a..f0c0bae56 100644
--- a/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
+++ b/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
@@ -0,0 +0,0 @@ public class VehicleExitEvent extends VehicleEvent implements Cancellable {
@@ -30,15 +30,15 @@ index 364451b5..b3269db2 100644
private final LivingEntity exited;
+ private final boolean isCancellable; // Paper
- public VehicleExitEvent(final Vehicle vehicle, final LivingEntity exited) {
+ public VehicleExitEvent(Vehicle vehicle, LivingEntity exited, boolean isCancellable) { // Paper
- public VehicleExitEvent(@NotNull final Vehicle vehicle, @NotNull final LivingEntity exited) {
+ public VehicleExitEvent(@NotNull final Vehicle vehicle, @NotNull final LivingEntity exited, boolean isCancellable) { // Paper
super(vehicle);
this.exited = exited;
+ // Paper start
+ this.isCancellable = isCancellable;
+ }
+
+ public VehicleExitEvent(final Vehicle vehicle, final LivingEntity exited) {
+ public VehicleExitEvent(@NotNull final Vehicle vehicle, @NotNull final LivingEntity exited) {
+ this(vehicle, exited, true);
+ // Paper end
}
@@ -60,11 +60,11 @@ index 364451b5..b3269db2 100644
+ // paper end
+ }
+
@NotNull
@Override
public HandlerList getHandlers() {
return handlers;
diff --git a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
index 4110d3bb..555899ef 100644
index a473b2c6e..a5b4aed52 100644
--- a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
+++ b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
@@ -0,0 +0,0 @@ public class EntityDismountEvent extends EntityEvent implements Cancellable
@@ -73,13 +73,13 @@ index 4110d3bb..555899ef 100644
private final Entity dismounted;
+ private final boolean isCancellable; // Paper
public EntityDismountEvent(Entity what, Entity dismounted)
public EntityDismountEvent(@NotNull Entity what, @NotNull Entity dismounted)
{
+ // Paper start
+ this(what, dismounted, true);
+ }
+
+ public EntityDismountEvent(Entity what, Entity dismounted, boolean isCancellable)
+ public EntityDismountEvent(@NotNull Entity what, @NotNull Entity dismounted, boolean isCancellable)
+ {
+ // Paper end
super( what );
@@ -87,7 +87,7 @@ index 4110d3bb..555899ef 100644
+ this.isCancellable = isCancellable; // Paper
}
public Entity getDismounted()
@NotNull
@@ -0,0 +0,0 @@ public class EntityDismountEvent extends EntityEvent implements Cancellable
@Override
public void setCancelled(boolean cancel)
@@ -104,7 +104,7 @@ index 4110d3bb..555899ef 100644
+ // Paper end
+ }
+
@NotNull
@Override
public HandlerList getHandlers()
{
--