Upstream update

This commit is contained in:
Aikar
2017-08-07 23:05:16 -04:00
parent 5ac8a3f491
commit ff5bd7b03b
24 changed files with 97 additions and 127 deletions

View File

@@ -1,11 +1,11 @@
From c5237a813380ef84b3988222166a0bd0682dde11 Mon Sep 17 00:00:00 2001
From 11823e523a56b4804bf890eca51e9716cd1c4542 Mon Sep 17 00:00:00 2001
From: Sweepyoface <github@sweepy.pw>
Date: Sat, 17 Jun 2017 18:48:21 -0400
Subject: [PATCH] Add UnknownCommandEvent
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index bef164983..3541ad3ff 100644
index 9c0b3c60e..202e7c20d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -78,6 +78,7 @@ import org.bukkit.craftbukkit.util.Versioning;
@@ -16,7 +16,7 @@ index bef164983..3541ad3ff 100644
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.event.player.PlayerChatTabCompleteEvent;
import org.bukkit.event.server.BroadcastMessageEvent;
@@ -668,7 +669,13 @@ public final class CraftServer implements Server {
@@ -674,7 +675,13 @@ public final class CraftServer implements Server {
// Spigot start
if (StringUtils.isNotEmpty(org.spigotmc.SpigotConfig.unknownCommandMessage)) {
@@ -32,5 +32,5 @@ index bef164983..3541ad3ff 100644
// Spigot end
--
2.13.3
2.13.0