Update upstream B/CB/S

This commit is contained in:
Zach Brown
2017-12-27 22:45:33 -06:00
parent a1b538fc71
commit eb0f5adfdc
23 changed files with 163 additions and 163 deletions

View File

@@ -1,11 +1,11 @@
From 2780e985421f6fdeab70e6a8f2e5c4a07a6a3d04 Mon Sep 17 00:00:00 2001
From bd173235efd360b6c6be2fcc273e8cf6e0265d5b 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 106dc7b29..aa098172f 100644
index 3a6e8d87..3f683238 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 106dc7b29..aa098172f 100644
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.event.player.PlayerChatTabCompleteEvent;
import org.bukkit.event.server.BroadcastMessageEvent;
@@ -676,7 +677,13 @@ public final class CraftServer implements Server {
@@ -675,7 +676,13 @@ public final class CraftServer implements Server {
// Spigot start
if (StringUtils.isNotEmpty(org.spigotmc.SpigotConfig.unknownCommandMessage)) {
@@ -32,5 +32,5 @@ index 106dc7b29..aa098172f 100644
// Spigot end
--
2.15.0
2.15.1.windows.2