mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 20:50:41 +01:00
5c7081fecc
* 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: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes:4090d01fSPIGOT-5047: Correct slot types for 1.14 inventoriese8c08362SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks.d445af3bSPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
57 lines
1.7 KiB
Diff
57 lines
1.7 KiB
Diff
From e3a455149e609554da57c83f1985c438e5aeec54 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
|
|
|