mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 11:42:55 +01:00
0976d52bbd
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:8d8475fcSPIGOT-4666: Force parameter in HumanEntity#sleep8b1588e2Fix ExplosionPrimeEvent#setFire not working with EnderCrystals39a287b7Don't ignore newlines in PlayerListHeader/Footer Spigot Changes: cf694d87 Add nullability annotations
57 lines
1.7 KiB
Diff
57 lines
1.7 KiB
Diff
From 50250b4955c5c76238ed4e75479dfa1aa751ba02 Mon Sep 17 00:00:00 2001
|
|
From: AlphaBlend <whizkid3000@hotmail.com>
|
|
Date: Thu, 8 Sep 2016 08:47:08 -0700
|
|
Subject: [PATCH] Add source to PlayerExpChangeEvent
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java b/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
|
|
index c99c9281e..7c340f539 100644
|
|
--- a/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
|
|
@@ -1,21 +1,43 @@
|
|
package org.bukkit.event.player;
|
|
|
|
+import org.bukkit.entity.Entity; // Paper
|
|
import org.bukkit.entity.Player;
|
|
import org.bukkit.event.HandlerList;
|
|
import org.jetbrains.annotations.NotNull;
|
|
|
|
+import org.jetbrains.annotations.Nullable; // Paper
|
|
+
|
|
/**
|
|
* Called when a players experience changes naturally
|
|
*/
|
|
public class PlayerExpChangeEvent extends PlayerEvent {
|
|
private static final HandlerList handlers = new HandlerList();
|
|
+ // Paper start
|
|
+ @Nullable
|
|
+ private final Entity source;
|
|
private int exp;
|
|
|
|
public PlayerExpChangeEvent(@NotNull final Player player, final int expAmount) {
|
|
+ this(player, null, expAmount);
|
|
+ }
|
|
+
|
|
+ public PlayerExpChangeEvent(@NotNull final Player player, @Nullable final Entity sourceEntity, final int expAmount) {
|
|
super(player);
|
|
+ source = sourceEntity;
|
|
exp = expAmount;
|
|
}
|
|
|
|
+ /**
|
|
+ * Get the source that provided the experience.
|
|
+ *
|
|
+ * @return The source of the experience
|
|
+ */
|
|
+ @Nullable
|
|
+ public Entity getSource() {
|
|
+ return source;
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Get the amount of experience the player will receive
|
|
*
|
|
--
|
|
2.21.0
|
|
|