Update Upstream
This commit is contained in:
parent
52cd8744e0
commit
f9f71eb14e
321 changed files with 809 additions and 856 deletions
|
@ -462,7 +462,7 @@ index 00000000..5582999f
|
|||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
index 9d0ae63f..911d90fd 100644
|
||||
index f020cb04..adfc7aae 100644
|
||||
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
@@ -0,0 +0,0 @@ import java.util.HashMap;
|
||||
|
@ -504,7 +504,7 @@ index 9d0ae63f..911d90fd 100644
|
|||
}
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||
index 47327376..ef38b2af 100644
|
||||
index 78a2d2f8..aa0c809a 100644
|
||||
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||
@@ -0,0 +0,0 @@ import java.util.WeakHashMap;
|
||||
|
@ -579,9 +579,9 @@ index 47327376..ef38b2af 100644
|
|||
+ }
|
||||
+ // Paper end
|
||||
+
|
||||
@Override
|
||||
public void clearPlugins() {
|
||||
synchronized (this) {
|
||||
disablePlugins();
|
||||
@@ -0,0 +0,0 @@ public final class SimplePluginManager implements PluginManager {
|
||||
));
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue