mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 07:48:53 +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
67 lines
1.9 KiB
Diff
67 lines
1.9 KiB
Diff
From bdee9be039bcf8a139395c9cf049f71ab881a9a0 Mon Sep 17 00:00:00 2001
|
|
From: MisterVector <whizkid3000@hotmail.com>
|
|
Date: Fri, 26 Oct 2018 21:33:13 -0700
|
|
Subject: [PATCH] Add PlayerPostRespawnEvent
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java
|
|
new file mode 100644
|
|
index 000000000..31f34b548
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java
|
|
@@ -0,0 +1,52 @@
|
|
+package com.destroystokyo.paper.event.player;
|
|
+
|
|
+import org.bukkit.Location;
|
|
+import org.bukkit.entity.Player;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.player.PlayerEvent;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+/**
|
|
+ * Fired after a player has respawned
|
|
+ */
|
|
+public class PlayerPostRespawnEvent extends PlayerEvent {
|
|
+ private final static HandlerList handlers = new HandlerList();
|
|
+ private final Location respawnedLocation;
|
|
+ private final boolean isBedSpawn;
|
|
+
|
|
+ public PlayerPostRespawnEvent(@NotNull final Player respawnPlayer, @NotNull final Location respawnedLocation, final boolean isBedSpawn) {
|
|
+ super(respawnPlayer);
|
|
+ this.respawnedLocation = respawnedLocation;
|
|
+ this.isBedSpawn = isBedSpawn;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Returns the location of the respawned player
|
|
+ *
|
|
+ * @return location of the respawned player
|
|
+ */
|
|
+ @NotNull
|
|
+ public Location getRespawnedLocation() {
|
|
+ return respawnedLocation.clone();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Checks if the player respawned to their bed
|
|
+ *
|
|
+ * @return whether the player respawned to their bed
|
|
+ */
|
|
+ public boolean isBedSpawn() {
|
|
+ return isBedSpawn;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ @NotNull
|
|
+ public HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+}
|
|
--
|
|
2.21.0
|
|
|