Update Upstream

This commit is contained in:
Spottedleaf 2019-05-05 19:58:04 -07:00
parent cb24079b77
commit eeb2ecd789
348 changed files with 1661 additions and 1710 deletions

View file

@ -1,4 +1,4 @@
From 115bd301484371f6d9f6dfdec617abbe9df39f74 Mon Sep 17 00:00:00 2001
From 5054117d47392e633989f9732641c6833311ed4b Mon Sep 17 00:00:00 2001
From: willies952002 <admin@domnian.com>
Date: Mon, 28 Nov 2016 10:16:39 -0500
Subject: [PATCH] Allow Reloading of Command Aliases
@ -56,10 +56,10 @@ index bd2c7a69..864c263b 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index 911d90fd..8d352eeb 100644
index adfc7aae..460fda05 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -289,4 +289,11 @@ public class SimpleCommandMap implements CommandMap {
@@ -297,4 +297,11 @@ public class SimpleCommandMap implements CommandMap {
}
}
}