mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-25 00:30:25 +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:4090d01f
SPIGOT-5047: Correct slot types for 1.14 inventoriese8c08362
SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks.d445af3b
SPIGOT-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
135 lines
4.5 KiB
Diff
135 lines
4.5 KiB
Diff
From 9bdc8d9de62d527ee067394e8b7d5bdd2afd3306 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Mon, 3 Jul 2017 18:11:34 -0500
|
|
Subject: [PATCH] ProfileWhitelistVerifyEvent
|
|
|
|
Fires when the server is validating if a player is whitelisted.
|
|
|
|
Allows you to do dynamic whitelisting and change of kick message
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java
|
|
new file mode 100644
|
|
index 000000000..b10176289
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java
|
|
@@ -0,0 +1,117 @@
|
|
+/*
|
|
+ * Copyright (c) 2017 - Daniel Ennis (Aikar) - MIT License
|
|
+ *
|
|
+ * Permission is hereby granted, free of charge, to any person obtaining
|
|
+ * a copy of this software and associated documentation files (the
|
|
+ * "Software"), to deal in the Software without restriction, including
|
|
+ * without limitation the rights to use, copy, modify, merge, publish,
|
|
+ * distribute, sublicense, and/or sell copies of the Software, and to
|
|
+ * permit persons to whom the Software is furnished to do so, subject to
|
|
+ * the following conditions:
|
|
+ *
|
|
+ * The above copyright notice and this permission notice shall be
|
|
+ * included in all copies or substantial portions of the Software.
|
|
+ *
|
|
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
|
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
|
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
|
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
+ */
|
|
+
|
|
+package com.destroystokyo.paper.event.profile;
|
|
+
|
|
+import com.destroystokyo.paper.profile.PlayerProfile;
|
|
+import org.bukkit.event.Event;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+import org.jetbrains.annotations.Nullable;
|
|
+
|
|
+/**
|
|
+ * Fires when the server needs to verify if a player is whitelisted.
|
|
+ *
|
|
+ * Plugins may override/control the servers whitelist with this event,
|
|
+ * and dynamically change the kick message.
|
|
+ *
|
|
+ */
|
|
+public class ProfileWhitelistVerifyEvent extends Event {
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+ @NotNull private final PlayerProfile profile;
|
|
+ private final boolean whitelistEnabled;
|
|
+ private boolean whitelisted;
|
|
+ private final boolean isOp;
|
|
+ @Nullable private String kickMessage;
|
|
+
|
|
+ public ProfileWhitelistVerifyEvent(@NotNull final PlayerProfile profile, boolean whitelistEnabled, boolean whitelisted, boolean isOp, @Nullable String kickMessage) {
|
|
+ this.profile = profile;
|
|
+ this.whitelistEnabled = whitelistEnabled;
|
|
+ this.whitelisted = whitelisted;
|
|
+ this.isOp = isOp;
|
|
+ this.kickMessage = kickMessage;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * @return the currently planned message to send to the user if they are not whitelisted
|
|
+ */
|
|
+ @Nullable
|
|
+ public String getKickMessage() {
|
|
+ return kickMessage;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * @param kickMessage The message to send to the player on kick if not whitelisted. May set to null to use the server configured default
|
|
+ */
|
|
+ public void setKickMessage(@Nullable String kickMessage) {
|
|
+ this.kickMessage = kickMessage;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * @return The profile of the player trying to connect
|
|
+ */
|
|
+ @NotNull
|
|
+ public PlayerProfile getPlayerProfile() {
|
|
+ return profile;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * @return Whether the player is whitelisted to play on this server (whitelist may be off is why its true)
|
|
+ */
|
|
+ public boolean isWhitelisted() {
|
|
+ return whitelisted;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Changes the players whitelisted state. false will deny the login
|
|
+ * @param whitelisted The new whitelisted state
|
|
+ */
|
|
+ public void setWhitelisted(boolean whitelisted) {
|
|
+ this.whitelisted = whitelisted;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * @return if the player obtained whitelist status by having op
|
|
+ */
|
|
+ public boolean isOp() {
|
|
+ return isOp;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * @return if the server even has whitelist on
|
|
+ */
|
|
+ public boolean isWhitelistEnabled() {
|
|
+ return whitelistEnabled;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+}
|
|
--
|
|
2.21.0
|
|
|