mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 02:55:47 +01:00
928bcc8d3a
Upstream has released updates that appear 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: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
105 lines
3.3 KiB
Diff
105 lines
3.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Wed, 2 Dec 2020 18:25:31 -0800
|
|
Subject: [PATCH] Add cause to Weather/ThunderChangeEvents
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/weather/ThunderChangeEvent.java b/src/main/java/org/bukkit/event/weather/ThunderChangeEvent.java
|
|
index 6cdf83476b4e366bed79960e3706bea5ebe56788..032395c7114b6d757acf1918ce2b014870e85fcd 100644
|
|
--- a/src/main/java/org/bukkit/event/weather/ThunderChangeEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/weather/ThunderChangeEvent.java
|
|
@@ -12,10 +12,20 @@ public class ThunderChangeEvent extends WeatherEvent implements Cancellable {
|
|
private static final HandlerList handlers = new HandlerList();
|
|
private boolean canceled;
|
|
private final boolean to;
|
|
+ // Paper start
|
|
+ private final Cause cause;
|
|
|
|
+ public ThunderChangeEvent(@NotNull final World world, final boolean to, @NotNull final Cause cause) {
|
|
+ super(world);
|
|
+ this.to = to;
|
|
+ this.cause = cause;
|
|
+ }
|
|
+
|
|
+ @Deprecated // Paper end
|
|
public ThunderChangeEvent(@NotNull final World world, final boolean to) {
|
|
super(world);
|
|
this.to = to;
|
|
+ this.cause = Cause.UNKNOWN; // Paper
|
|
}
|
|
|
|
@Override
|
|
@@ -47,4 +57,23 @@ public class ThunderChangeEvent extends WeatherEvent implements Cancellable {
|
|
public static HandlerList getHandlerList() {
|
|
return handlers;
|
|
}
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the cause of the weather change.
|
|
+ *
|
|
+ * @return the weather change cause
|
|
+ */
|
|
+ @NotNull
|
|
+ public Cause getCause() {
|
|
+ return this.cause;
|
|
+ }
|
|
+
|
|
+ public enum Cause {
|
|
+ COMMAND,
|
|
+ NATURAL,
|
|
+ SLEEP,
|
|
+ PLUGIN,
|
|
+ UNKNOWN
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/event/weather/WeatherChangeEvent.java b/src/main/java/org/bukkit/event/weather/WeatherChangeEvent.java
|
|
index d562d87e7418641e52f4dae44f573eaa31add44a..dabd390b84354c14c269c03cbed2006014d004b2 100644
|
|
--- a/src/main/java/org/bukkit/event/weather/WeatherChangeEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/weather/WeatherChangeEvent.java
|
|
@@ -12,10 +12,20 @@ public class WeatherChangeEvent extends WeatherEvent implements Cancellable {
|
|
private static final HandlerList handlers = new HandlerList();
|
|
private boolean canceled;
|
|
private final boolean to;
|
|
+ // Paper start
|
|
+ private final Cause cause;
|
|
|
|
+ public WeatherChangeEvent(@NotNull final World world, final boolean to, @NotNull Cause cause) {
|
|
+ super(world);
|
|
+ this.to = to;
|
|
+ this.cause = cause;
|
|
+ }
|
|
+
|
|
+ @Deprecated // Paper end
|
|
public WeatherChangeEvent(@NotNull final World world, final boolean to) {
|
|
super(world);
|
|
this.to = to;
|
|
+ this.cause = Cause.UNKNOWN; // Paper
|
|
}
|
|
|
|
@Override
|
|
@@ -47,4 +57,23 @@ public class WeatherChangeEvent extends WeatherEvent implements Cancellable {
|
|
public static HandlerList getHandlerList() {
|
|
return handlers;
|
|
}
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the cause of the weather change.
|
|
+ *
|
|
+ * @return the weather change cause
|
|
+ */
|
|
+ @NotNull
|
|
+ public Cause getCause() {
|
|
+ return cause;
|
|
+ }
|
|
+
|
|
+ public enum Cause {
|
|
+ COMMAND,
|
|
+ NATURAL,
|
|
+ SLEEP,
|
|
+ PLUGIN,
|
|
+ UNKNOWN
|
|
+ }
|
|
+ // Paper end
|
|
}
|