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: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
97 lines
2.4 KiB
Diff
97 lines
2.4 KiB
Diff
From 4dc8f1c4e6badf0aa20464f3143a585c669d7c23 Mon Sep 17 00:00:00 2001
|
|
From: Sweepyoface <github@sweepy.pw>
|
|
Date: Sat, 17 Jun 2017 18:48:06 -0400
|
|
Subject: [PATCH] Add UnknownCommandEvent
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java b/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java
|
|
new file mode 100644
|
|
index 000000000..251342c3c
|
|
--- /dev/null
|
|
+++ b/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java
|
|
@@ -0,0 +1,82 @@
|
|
+package org.bukkit.event.command;
|
|
+
|
|
+import org.bukkit.command.CommandSender;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.Event;
|
|
+
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+import org.jetbrains.annotations.Nullable;
|
|
+
|
|
+/**
|
|
+ * Thrown when a player executes a command that is not defined
|
|
+ */
|
|
+public class UnknownCommandEvent extends Event {
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+ @NotNull private CommandSender sender;
|
|
+ @NotNull private String commandLine;
|
|
+ @Nullable private String message;
|
|
+
|
|
+ public UnknownCommandEvent(@NotNull final CommandSender sender, @NotNull final String commandLine, @Nullable final String message) {
|
|
+ super(false);
|
|
+ this.sender = sender;
|
|
+ this.commandLine = commandLine;
|
|
+ this.message = message;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the CommandSender or ConsoleCommandSender
|
|
+ * <p>
|
|
+ *
|
|
+ * @return Sender of the command
|
|
+ */
|
|
+ @NotNull
|
|
+ public CommandSender getSender() {
|
|
+ return sender;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the command that was send
|
|
+ * <p>
|
|
+ *
|
|
+ * @return Command sent
|
|
+ */
|
|
+ @NotNull
|
|
+ public String getCommandLine() {
|
|
+ return commandLine;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets message that will be returned
|
|
+ * <p>
|
|
+ *
|
|
+ * @return Unknown command message
|
|
+ */
|
|
+ @Nullable
|
|
+ public String getMessage() {
|
|
+ return message;
|
|
+ }
|
|
+
|
|
+
|
|
+ /**
|
|
+ * Sets message that will be returned
|
|
+ * <p>
|
|
+ * Set to null to avoid any message being sent
|
|
+ *
|
|
+ * @param message the message to be returned, or null
|
|
+ */
|
|
+ public void setMessage(@Nullable String message) {
|
|
+ this.message = message;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+}
|
|
+
|
|
--
|
|
2.21.0
|
|
|