mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 06:24:06 +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
66 lines
1.8 KiB
Diff
66 lines
1.8 KiB
Diff
From 0e9476604dfa54e5502607d51dc95c61b15ceb84 Mon Sep 17 00:00:00 2001
|
|
From: Isaac Moore <rmsy@me.com>
|
|
Date: Mon, 29 Feb 2016 18:02:25 -0600
|
|
Subject: [PATCH] Add PlayerLocaleChangeEvent
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java
|
|
new file mode 100644
|
|
index 000000000..29dd763a9
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java
|
|
@@ -0,0 +1,50 @@
|
|
+package com.destroystokyo.paper.event.player;
|
|
+
|
|
+import org.bukkit.entity.Player;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.player.PlayerEvent;
|
|
+
|
|
+/**
|
|
+ * Called when the locale of the player is changed.
|
|
+ *
|
|
+ * @deprecated Replaced by {@link org.bukkit.event.player.PlayerLocaleChangeEvent} upstream
|
|
+ */
|
|
+@Deprecated
|
|
+public class PlayerLocaleChangeEvent extends PlayerEvent {
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+ private final String oldLocale;
|
|
+ private final String newLocale;
|
|
+
|
|
+ public PlayerLocaleChangeEvent(final Player player, final String oldLocale, final String newLocale) {
|
|
+ super(player);
|
|
+ this.oldLocale = oldLocale;
|
|
+ this.newLocale = newLocale;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the locale the player switched from.
|
|
+ *
|
|
+ * @return player's old locale
|
|
+ */
|
|
+ public String getOldLocale() {
|
|
+ return oldLocale;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the locale the player is changed to.
|
|
+ *
|
|
+ * @return player's new locale
|
|
+ */
|
|
+ public String getNewLocale() {
|
|
+ return newLocale;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+}
|
|
--
|
|
2.21.0
|
|
|