move extra plugins patch up & more work
This commit is contained in:
parent
7665ae86d6
commit
e481692afd
458 changed files with 192 additions and 190 deletions
|
@ -7,11 +7,11 @@ Subject: [PATCH] Add command line option to load extra plugin jars not in the
|
|||
ex: java -jar paperclip.jar nogui -add-plugin=/path/to/plugin.jar -add-plugin=/path/to/another/plugin_jar.jar
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index 0593d5487f411d34edc3d3b15213db4d86af1407..9aa6758e206f5105b6004bb415f04e4e9f8cb24b 100644
|
||||
index a238302f2a12194aa30a88867070705dc749b36b..cc42bfa74b41ef6d6374efa7b882f71677fb0824 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -2071,6 +2071,20 @@ public final class Bukkit {
|
||||
return server.getCurrentTick();
|
||||
@@ -73,6 +73,20 @@ public final class Bukkit {
|
||||
return server;
|
||||
}
|
||||
|
||||
+ /**
|
||||
|
@ -29,15 +29,15 @@ index 0593d5487f411d34edc3d3b15213db4d86af1407..9aa6758e206f5105b6004bb415f04e4e
|
|||
+ }
|
||||
+
|
||||
/**
|
||||
* Checks if the server is in the process of being shutdown.
|
||||
*
|
||||
* Attempts to set the {@link Server} singleton.
|
||||
* <p>
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index 0691ecbf954ae73df396b356f29a896c59ab680a..eab6b65bb018b4ec8709c8f61a1d7829b8f5316c 100644
|
||||
index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..1fb1d4f32af8150711ca766fcd7d0a0c177df7c4 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1818,6 +1818,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
*/
|
||||
int getCurrentTick();
|
||||
@@ -58,6 +58,18 @@ import org.jetbrains.annotations.Nullable;
|
||||
*/
|
||||
public interface Server extends PluginMessageRecipient {
|
||||
|
||||
+ /**
|
||||
+ * Returns the de facto plugins directory, generally used for storing plugin jars to be loaded,
|
||||
|
@ -52,13 +52,13 @@ index 0691ecbf954ae73df396b356f29a896c59ab680a..eab6b65bb018b4ec8709c8f61a1d7829
|
|||
+ File getPluginsFolder();
|
||||
+
|
||||
/**
|
||||
* Checks if the server is in the process of being shutdown.
|
||||
*
|
||||
* Used for all administrative messages, such as an operator using a
|
||||
* command.
|
||||
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||
index 20b4ef7a94e00d9264b8ecc126ce5853b584ea8c..0d9d729a18b5388b06ab0a3749e55f91f838be88 100644
|
||||
index 7548e40af8043c1b5716f2d7d0122833466854c4..83d3ee09cc6f91b095f6b8519a431ef70f2b67ec 100644
|
||||
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||
@@ -115,6 +115,12 @@ public final class SimplePluginManager implements PluginManager {
|
||||
@@ -111,6 +111,12 @@ public final class SimplePluginManager implements PluginManager {
|
||||
@Override
|
||||
@NotNull
|
||||
public Plugin[] loadPlugins(@NotNull File directory) {
|
||||
|
@ -71,7 +71,7 @@ index 20b4ef7a94e00d9264b8ecc126ce5853b584ea8c..0d9d729a18b5388b06ab0a3749e55f91
|
|||
Validate.notNull(directory, "Directory cannot be null");
|
||||
Validate.isTrue(directory.isDirectory(), "Directory must be a directory");
|
||||
|
||||
@@ -132,7 +138,11 @@ public final class SimplePluginManager implements PluginManager {
|
||||
@@ -128,7 +134,11 @@ public final class SimplePluginManager implements PluginManager {
|
||||
Map<String, Collection<String>> softDependencies = new HashMap<String, Collection<String>>();
|
||||
|
||||
// This is where it figures out all possible plugins
|
||||
|
@ -84,7 +84,7 @@ index 20b4ef7a94e00d9264b8ecc126ce5853b584ea8c..0d9d729a18b5388b06ab0a3749e55f91
|
|||
PluginLoader loader = null;
|
||||
for (Pattern filter : filters) {
|
||||
Matcher match = filter.matcher(file.getName());
|
||||
@@ -148,14 +158,14 @@ public final class SimplePluginManager implements PluginManager {
|
||||
@@ -144,14 +154,14 @@ public final class SimplePluginManager implements PluginManager {
|
||||
description = loader.getPluginDescription(file);
|
||||
String name = description.getName();
|
||||
if (name.equalsIgnoreCase("bukkit") || name.equalsIgnoreCase("minecraft") || name.equalsIgnoreCase("mojang")) {
|
||||
|
@ -102,7 +102,7 @@ index 20b4ef7a94e00d9264b8ecc126ce5853b584ea8c..0d9d729a18b5388b06ab0a3749e55f91
|
|||
continue;
|
||||
}
|
||||
|
||||
@@ -166,7 +176,7 @@ public final class SimplePluginManager implements PluginManager {
|
||||
@@ -162,7 +172,7 @@ public final class SimplePluginManager implements PluginManager {
|
||||
description.getName(),
|
||||
file.getPath(),
|
||||
replacedFile.getPath(),
|
||||
|
@ -111,7 +111,7 @@ index 20b4ef7a94e00d9264b8ecc126ce5853b584ea8c..0d9d729a18b5388b06ab0a3749e55f91
|
|||
));
|
||||
}
|
||||
|
||||
@@ -187,7 +197,7 @@ public final class SimplePluginManager implements PluginManager {
|
||||
@@ -183,7 +193,7 @@ public final class SimplePluginManager implements PluginManager {
|
||||
file.getPath(),
|
||||
provided,
|
||||
pluginFile.getPath(),
|
||||
|
@ -120,7 +120,7 @@ index 20b4ef7a94e00d9264b8ecc126ce5853b584ea8c..0d9d729a18b5388b06ab0a3749e55f91
|
|||
));
|
||||
} else {
|
||||
String replacedPlugin = pluginsProvided.put(provided, description.getName());
|
||||
@@ -269,7 +279,7 @@ public final class SimplePluginManager implements PluginManager {
|
||||
@@ -265,7 +275,7 @@ public final class SimplePluginManager implements PluginManager {
|
||||
|
||||
server.getLogger().log(
|
||||
Level.SEVERE,
|
||||
|
@ -129,7 +129,7 @@ index 20b4ef7a94e00d9264b8ecc126ce5853b584ea8c..0d9d729a18b5388b06ab0a3749e55f91
|
|||
new UnknownDependencyException("Unknown dependency " + dependency + ". Please download and install " + dependency + " to run this plugin."));
|
||||
break;
|
||||
}
|
||||
@@ -308,11 +318,11 @@ public final class SimplePluginManager implements PluginManager {
|
||||
@@ -304,11 +314,11 @@ public final class SimplePluginManager implements PluginManager {
|
||||
loadedPlugins.add(loadedPlugin.getName());
|
||||
loadedPlugins.addAll(loadedPlugin.getDescription().getProvides());
|
||||
} else {
|
||||
|
@ -143,7 +143,7 @@ index 20b4ef7a94e00d9264b8ecc126ce5853b584ea8c..0d9d729a18b5388b06ab0a3749e55f91
|
|||
}
|
||||
}
|
||||
}
|
||||
@@ -339,11 +349,11 @@ public final class SimplePluginManager implements PluginManager {
|
||||
@@ -335,11 +345,11 @@ public final class SimplePluginManager implements PluginManager {
|
||||
loadedPlugins.add(loadedPlugin.getName());
|
||||
loadedPlugins.addAll(loadedPlugin.getDescription().getProvides());
|
||||
} else {
|
||||
|
@ -157,7 +157,7 @@ index 20b4ef7a94e00d9264b8ecc126ce5853b584ea8c..0d9d729a18b5388b06ab0a3749e55f91
|
|||
}
|
||||
}
|
||||
}
|
||||
@@ -356,7 +366,7 @@ public final class SimplePluginManager implements PluginManager {
|
||||
@@ -352,7 +362,7 @@ public final class SimplePluginManager implements PluginManager {
|
||||
while (failedPluginIterator.hasNext()) {
|
||||
File file = failedPluginIterator.next();
|
||||
failedPluginIterator.remove();
|
||||
|
@ -167,10 +167,10 @@ index 20b4ef7a94e00d9264b8ecc126ce5853b584ea8c..0d9d729a18b5388b06ab0a3749e55f91
|
|||
}
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||||
index 80236a0934861902db7f15571d0d9b4902e70045..d2712f45dbcf26fabe8463d99f378bf422c66970 100644
|
||||
index cf2f517765d8f2a23cc4a17d9ee2dcd81f841b1b..9700ed558e65260264279b92dc661f39a0d0209c 100644
|
||||
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||||
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||||
@@ -94,7 +94,7 @@ public final class JavaPluginLoader implements PluginLoader {
|
||||
@@ -91,7 +91,7 @@ public final class JavaPluginLoader implements PluginLoader {
|
||||
throw new InvalidPluginException(ex);
|
||||
}
|
||||
|
|
@ -472,10 +472,10 @@ index 0000000000000000000000000000000000000000..77db592d05b754f879f8d1790642e9d9
|
|||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index a238302f2a12194aa30a88867070705dc749b36b..b8e63b2c2870dd2eb9d31f51590b9b958de6a17f 100644
|
||||
index cc42bfa74b41ef6d6374efa7b882f71677fb0824..ef06bd2972e0a4e7ffa0e91d2b0de5d7f8425edc 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -312,7 +312,9 @@ public final class Bukkit {
|
||||
@@ -326,7 +326,9 @@ public final class Bukkit {
|
||||
*
|
||||
* @param message the message
|
||||
* @return the number of players
|
||||
|
@ -485,7 +485,7 @@ index a238302f2a12194aa30a88867070705dc749b36b..b8e63b2c2870dd2eb9d31f51590b9b95
|
|||
public static int broadcastMessage(@NotNull String message) {
|
||||
return server.broadcastMessage(message);
|
||||
}
|
||||
@@ -955,6 +957,19 @@ public final class Bukkit {
|
||||
@@ -969,6 +971,19 @@ public final class Bukkit {
|
||||
server.shutdown();
|
||||
}
|
||||
|
||||
|
@ -505,7 +505,7 @@ index a238302f2a12194aa30a88867070705dc749b36b..b8e63b2c2870dd2eb9d31f51590b9b95
|
|||
/**
|
||||
* Broadcasts the specified message to every user with the given
|
||||
* permission name.
|
||||
@@ -964,6 +979,21 @@ public final class Bukkit {
|
||||
@@ -978,6 +993,21 @@ public final class Bukkit {
|
||||
* permissibles} must have to receive the broadcast
|
||||
* @return number of message recipients
|
||||
*/
|
||||
|
@ -527,7 +527,7 @@ index a238302f2a12194aa30a88867070705dc749b36b..b8e63b2c2870dd2eb9d31f51590b9b95
|
|||
public static int broadcast(@NotNull String message, @NotNull String permission) {
|
||||
return server.broadcast(message, permission);
|
||||
}
|
||||
@@ -1163,6 +1193,7 @@ public final class Bukkit {
|
||||
@@ -1177,6 +1207,7 @@ public final class Bukkit {
|
||||
return server.createInventory(owner, type);
|
||||
}
|
||||
|
||||
|
@ -535,7 +535,7 @@ index a238302f2a12194aa30a88867070705dc749b36b..b8e63b2c2870dd2eb9d31f51590b9b95
|
|||
/**
|
||||
* Creates an empty inventory with the specified type and title. If the type
|
||||
* is {@link InventoryType#CHEST}, the new inventory has a size of 27;
|
||||
@@ -1188,6 +1219,38 @@ public final class Bukkit {
|
||||
@@ -1202,6 +1233,38 @@ public final class Bukkit {
|
||||
* @see InventoryType#isCreatable()
|
||||
*/
|
||||
@NotNull
|
||||
|
@ -574,7 +574,7 @@ index a238302f2a12194aa30a88867070705dc749b36b..b8e63b2c2870dd2eb9d31f51590b9b95
|
|||
public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) {
|
||||
return server.createInventory(owner, type, title);
|
||||
}
|
||||
@@ -1206,6 +1269,7 @@ public final class Bukkit {
|
||||
@@ -1220,6 +1283,7 @@ public final class Bukkit {
|
||||
return server.createInventory(owner, size);
|
||||
}
|
||||
|
||||
|
@ -582,7 +582,7 @@ index a238302f2a12194aa30a88867070705dc749b36b..b8e63b2c2870dd2eb9d31f51590b9b95
|
|||
/**
|
||||
* Creates an empty inventory of type {@link InventoryType#CHEST} with the
|
||||
* specified size and title.
|
||||
@@ -1218,10 +1282,30 @@ public final class Bukkit {
|
||||
@@ -1232,10 +1296,30 @@ public final class Bukkit {
|
||||
* @throws IllegalArgumentException if the size is not a multiple of 9
|
||||
*/
|
||||
@NotNull
|
||||
|
@ -613,7 +613,7 @@ index a238302f2a12194aa30a88867070705dc749b36b..b8e63b2c2870dd2eb9d31f51590b9b95
|
|||
/**
|
||||
* Creates an empty merchant.
|
||||
*
|
||||
@@ -1229,7 +1313,20 @@ public final class Bukkit {
|
||||
@@ -1243,7 +1327,20 @@ public final class Bukkit {
|
||||
* when the merchant inventory is viewed
|
||||
* @return a new merchant
|
||||
*/
|
||||
|
@ -634,7 +634,7 @@ index a238302f2a12194aa30a88867070705dc749b36b..b8e63b2c2870dd2eb9d31f51590b9b95
|
|||
public static Merchant createMerchant(@Nullable String title) {
|
||||
return server.createMerchant(title);
|
||||
}
|
||||
@@ -1309,22 +1406,47 @@ public final class Bukkit {
|
||||
@@ -1323,22 +1420,47 @@ public final class Bukkit {
|
||||
return server.isPrimaryThread();
|
||||
}
|
||||
|
||||
|
@ -756,10 +756,10 @@ index 803fa0019869127ee8c7e4fb1777a59c43e66f8a..c65f0d6569c130b4920a9e71ad24af64
|
|||
+ // Paper end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..f048278df8abb313a319136e8b697d9c87fb5d0a 100644
|
||||
index 1fb1d4f32af8150711ca766fcd7d0a0c177df7c4..4bea157f06924d80a850dd315152812975855fe9 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -56,13 +56,13 @@ import org.jetbrains.annotations.Nullable;
|
||||
@@ -56,7 +56,7 @@ import org.jetbrains.annotations.Nullable;
|
||||
/**
|
||||
* Represents a server implementation.
|
||||
*/
|
||||
|
@ -767,6 +767,8 @@ index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..f048278df8abb313a319136e8b697d9c
|
|||
+public interface Server extends PluginMessageRecipient, net.kyori.adventure.audience.ForwardingAudience { // Paper
|
||||
|
||||
/**
|
||||
* Returns the de facto plugins directory, generally used for storing plugin jars to be loaded,
|
||||
@@ -74,7 +74,7 @@ public interface Server extends PluginMessageRecipient {
|
||||
* Used for all administrative messages, such as an operator using a
|
||||
* command.
|
||||
* <p>
|
||||
|
@ -775,7 +777,7 @@ index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..f048278df8abb313a319136e8b697d9c
|
|||
*/
|
||||
public static final String BROADCAST_CHANNEL_ADMINISTRATIVE = "bukkit.broadcast.admin";
|
||||
|
||||
@@ -70,7 +70,7 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -82,7 +82,7 @@ public interface Server extends PluginMessageRecipient {
|
||||
* Used for all announcement messages, such as informing users that a
|
||||
* player has joined.
|
||||
* <p>
|
||||
|
@ -784,7 +786,7 @@ index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..f048278df8abb313a319136e8b697d9c
|
|||
*/
|
||||
public static final String BROADCAST_CHANNEL_USERS = "bukkit.broadcast.user";
|
||||
|
||||
@@ -257,7 +257,9 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -269,7 +269,9 @@ public interface Server extends PluginMessageRecipient {
|
||||
*
|
||||
* @param message the message
|
||||
* @return the number of players
|
||||
|
@ -794,7 +796,7 @@ index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..f048278df8abb313a319136e8b697d9c
|
|||
public int broadcastMessage(@NotNull String message);
|
||||
|
||||
/**
|
||||
@@ -809,8 +811,33 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -821,8 +823,33 @@ public interface Server extends PluginMessageRecipient {
|
||||
* @param permission the required permission {@link Permissible
|
||||
* permissibles} must have to receive the broadcast
|
||||
* @return number of message recipients
|
||||
|
@ -828,7 +830,7 @@ index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..f048278df8abb313a319136e8b697d9c
|
|||
|
||||
/**
|
||||
* Gets the player by the given name, regardless if they are offline or
|
||||
@@ -975,6 +1002,7 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -987,6 +1014,7 @@ public interface Server extends PluginMessageRecipient {
|
||||
@NotNull
|
||||
Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type);
|
||||
|
||||
|
@ -836,7 +838,7 @@ index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..f048278df8abb313a319136e8b697d9c
|
|||
/**
|
||||
* Creates an empty inventory with the specified type and title. If the type
|
||||
* is {@link InventoryType#CHEST}, the new inventory has a size of 27;
|
||||
@@ -1000,6 +1028,36 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -1012,6 +1040,36 @@ public interface Server extends PluginMessageRecipient {
|
||||
* @see InventoryType#isCreatable()
|
||||
*/
|
||||
@NotNull
|
||||
|
@ -873,7 +875,7 @@ index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..f048278df8abb313a319136e8b697d9c
|
|||
Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title);
|
||||
|
||||
/**
|
||||
@@ -1014,6 +1072,22 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -1026,6 +1084,22 @@ public interface Server extends PluginMessageRecipient {
|
||||
@NotNull
|
||||
Inventory createInventory(@Nullable InventoryHolder owner, int size) throws IllegalArgumentException;
|
||||
|
||||
|
@ -896,7 +898,7 @@ index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..f048278df8abb313a319136e8b697d9c
|
|||
/**
|
||||
* Creates an empty inventory of type {@link InventoryType#CHEST} with the
|
||||
* specified size and title.
|
||||
@@ -1024,10 +1098,13 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -1036,10 +1110,13 @@ public interface Server extends PluginMessageRecipient {
|
||||
* viewed
|
||||
* @return a new inventory
|
||||
* @throws IllegalArgumentException if the size is not a multiple of 9
|
||||
|
@ -910,7 +912,7 @@ index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..f048278df8abb313a319136e8b697d9c
|
|||
/**
|
||||
* Creates an empty merchant.
|
||||
*
|
||||
@@ -1035,7 +1112,18 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -1047,7 +1124,18 @@ public interface Server extends PluginMessageRecipient {
|
||||
* when the merchant inventory is viewed
|
||||
* @return a new merchant
|
||||
*/
|
||||
|
@ -929,7 +931,7 @@ index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..f048278df8abb313a319136e8b697d9c
|
|||
Merchant createMerchant(@Nullable String title);
|
||||
|
||||
/**
|
||||
@@ -1099,20 +1187,41 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -1111,20 +1199,41 @@ public interface Server extends PluginMessageRecipient {
|
||||
*/
|
||||
boolean isPrimaryThread();
|
||||
|
||||
|
@ -971,7 +973,7 @@ index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..f048278df8abb313a319136e8b697d9c
|
|||
String getShutdownMessage();
|
||||
|
||||
/**
|
||||
@@ -1489,7 +1598,9 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -1501,7 +1610,9 @@ public interface Server extends PluginMessageRecipient {
|
||||
* Sends the component to the player
|
||||
*
|
||||
* @param component the components to send
|
||||
|
@ -981,7 +983,7 @@ index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..f048278df8abb313a319136e8b697d9c
|
|||
public void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
|
||||
throw new UnsupportedOperationException("Not supported yet.");
|
||||
}
|
||||
@@ -1498,7 +1609,9 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -1510,7 +1621,9 @@ public interface Server extends PluginMessageRecipient {
|
||||
* Sends an array of components as a single message to the player
|
||||
*
|
||||
* @param components the components to send
|
|
@ -5,10 +5,10 @@ Subject: [PATCH] Add getTPS method
|
|||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index b8e63b2c2870dd2eb9d31f51590b9b958de6a17f..06d84ca5ce794d264dc50b83283bc09e550b8cb7 100644
|
||||
index ef06bd2972e0a4e7ffa0e91d2b0de5d7f8425edc..fb2001968b4f7498da9ea7bbb79468c1e5383c0f 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -1671,6 +1671,17 @@ public final class Bukkit {
|
||||
@@ -1685,6 +1685,17 @@ public final class Bukkit {
|
||||
return server.getEntity(uuid);
|
||||
}
|
||||
|
||||
|
@ -27,10 +27,10 @@ index b8e63b2c2870dd2eb9d31f51590b9b958de6a17f..06d84ca5ce794d264dc50b83283bc09e
|
|||
* Get the advancement specified by this key.
|
||||
*
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index f048278df8abb313a319136e8b697d9c87fb5d0a..c076053238cd6f1787834ee505497d66a17d3769 100644
|
||||
index 4bea157f06924d80a850dd315152812975855fe9..dfe7aa74fb4b49a2f3994571c041f1a5d9668841 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1414,6 +1414,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
@@ -1426,6 +1426,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
@Nullable
|
||||
Entity getEntity(@NotNull UUID uuid);
|
||||
|
|
@ -5,7 +5,7 @@ Subject: [PATCH] Automatically disable plugins that fail to load
|
|||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||||
index cf2f517765d8f2a23cc4a17d9ee2dcd81f841b1b..a3bc4155536f612ee2ae38ec7f16b974bdd24ab2 100644
|
||||
index 9700ed558e65260264279b92dc661f39a0d0209c..451fce7223834169751679ce6dc22de3df24eae9 100644
|
||||
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||||
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||||
@@ -335,6 +335,10 @@ public final class JavaPluginLoader implements PluginLoader {
|
|
@ -5,10 +5,10 @@ Subject: [PATCH] Expose server CommandMap
|
|||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index 06d84ca5ce794d264dc50b83283bc09e550b8cb7..7da8180e4408a233af334a13661ebbc6781318ec 100644
|
||||
index fb2001968b4f7498da9ea7bbb79468c1e5383c0f..93598a80a3f71d5e90fa9d7c93c01e1024c045c8 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -1855,6 +1855,19 @@ public final class Bukkit {
|
||||
@@ -1869,6 +1869,19 @@ public final class Bukkit {
|
||||
return server.getUnsafe();
|
||||
}
|
||||
|
||||
|
@ -29,10 +29,10 @@ index 06d84ca5ce794d264dc50b83283bc09e550b8cb7..7da8180e4408a233af334a13661ebbc6
|
|||
public static Server.Spigot spigot() {
|
||||
return server.spigot();
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index c076053238cd6f1787834ee505497d66a17d3769..ad16ce2f62d6519efe8ec6da94aa2ae255521480 100644
|
||||
index dfe7aa74fb4b49a2f3994571c041f1a5d9668841..b476f473078512363a7142d82fbc28afaa4690ff 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1424,6 +1424,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
@@ -1436,6 +1436,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
public double[] getTPS();
|
||||
// Paper end
|
||||
|
|
@ -6,10 +6,10 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
|
|||
Change Javadoc to be accurate
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index 7da8180e4408a233af334a13661ebbc6781318ec..0b6299a586e25f97eb734e650728e50d19ad16ce 100644
|
||||
index 93598a80a3f71d5e90fa9d7c93c01e1024c045c8..f1612106fa284f9d69f4b8981e5e5efac22765b8 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -319,6 +319,30 @@ public final class Bukkit {
|
||||
@@ -333,6 +333,30 @@ public final class Bukkit {
|
||||
return server.broadcastMessage(message);
|
||||
}
|
||||
|
||||
|
@ -41,10 +41,10 @@ index 7da8180e4408a233af334a13661ebbc6781318ec..0b6299a586e25f97eb734e650728e50d
|
|||
* Gets the name of the update folder. The update folder is used to safely
|
||||
* update plugins at the right moment on a plugin load.
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index ad16ce2f62d6519efe8ec6da94aa2ae255521480..797ff4d2b16fba1a423c8dc247fde0ad9199b5c1 100644
|
||||
index b476f473078512363a7142d82fbc28afaa4690ff..30252583c457a1afafa4172321e13673fb19c08f 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -262,6 +262,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
@@ -274,6 +274,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
@Deprecated // Paper
|
||||
public int broadcastMessage(@NotNull String message);
|
||||
|
|
@ -506,7 +506,7 @@ index f020cb04eba27a2e70fc7cf799ebbfb434b9d974..adfc7aae2c0f49bbcdd358e83b04a0cf
|
|||
}
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||
index 7548e40af8043c1b5716f2d7d0122833466854c4..c2c49ee9b5531bc4761d2da54cd707c57fc647bf 100644
|
||||
index 83d3ee09cc6f91b095f6b8519a431ef70f2b67ec..1fbf690403eefe017b146c141c6d47d9b8d9d4bb 100644
|
||||
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||
@@ -23,6 +23,10 @@ import java.util.WeakHashMap;
|
||||
|
@ -520,7 +520,7 @@ index 7548e40af8043c1b5716f2d7d0122833466854c4..c2c49ee9b5531bc4761d2da54cd707c5
|
|||
import org.apache.commons.lang.Validate;
|
||||
import org.bukkit.Server;
|
||||
import org.bukkit.World;
|
||||
@@ -478,7 +482,8 @@ public final class SimplePluginManager implements PluginManager {
|
||||
@@ -488,7 +492,8 @@ public final class SimplePluginManager implements PluginManager {
|
||||
try {
|
||||
plugin.getPluginLoader().enablePlugin(plugin);
|
||||
} catch (Throwable ex) {
|
||||
|
@ -530,7 +530,7 @@ index 7548e40af8043c1b5716f2d7d0122833466854c4..c2c49ee9b5531bc4761d2da54cd707c5
|
|||
}
|
||||
|
||||
HandlerList.bakeAll();
|
||||
@@ -499,32 +504,37 @@ public final class SimplePluginManager implements PluginManager {
|
||||
@@ -509,32 +514,37 @@ public final class SimplePluginManager implements PluginManager {
|
||||
try {
|
||||
plugin.getPluginLoader().disablePlugin(plugin);
|
||||
} catch (Throwable ex) {
|
||||
|
@ -573,7 +573,7 @@ index 7548e40af8043c1b5716f2d7d0122833466854c4..c2c49ee9b5531bc4761d2da54cd707c5
|
|||
}
|
||||
|
||||
try {
|
||||
@@ -537,6 +547,13 @@ public final class SimplePluginManager implements PluginManager {
|
||||
@@ -547,6 +557,13 @@ public final class SimplePluginManager implements PluginManager {
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -587,7 +587,7 @@ index 7548e40af8043c1b5716f2d7d0122833466854c4..c2c49ee9b5531bc4761d2da54cd707c5
|
|||
@Override
|
||||
public void clearPlugins() {
|
||||
synchronized (this) {
|
||||
@@ -600,7 +617,13 @@ public final class SimplePluginManager implements PluginManager {
|
||||
@@ -610,7 +627,13 @@ public final class SimplePluginManager implements PluginManager {
|
||||
));
|
||||
}
|
||||
} catch (Throwable ex) {
|
|
@ -362,7 +362,7 @@ index a850f0780de05463fc0d3f9e15ff7f19d88b2aed..9026e108ccd3a88aee1267ee275137be
|
|||
+ // Paper end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||||
index a3bc4155536f612ee2ae38ec7f16b974bdd24ab2..b7cd98f20de3421cd3b8a95cfa2155fa77afa8b1 100644
|
||||
index 451fce7223834169751679ce6dc22de3df24eae9..0cbac77e16fc36d805b79dd44837a38a79618c0b 100644
|
||||
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||||
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||||
@@ -291,21 +291,7 @@ public final class JavaPluginLoader implements PluginLoader {
|
|
@ -6,10 +6,10 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to
|
|||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index 0b6299a586e25f97eb734e650728e50d19ad16ce..308d9cd655c37e8a00bb053ecd2ba2450555158f 100644
|
||||
index f1612106fa284f9d69f4b8981e5e5efac22765b8..0a2fc619ec9f28b43920cedcd18b75edfa66a36b 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -1890,6 +1890,13 @@ public final class Bukkit {
|
||||
@@ -1904,6 +1904,13 @@ public final class Bukkit {
|
||||
public static org.bukkit.command.CommandMap getCommandMap() {
|
||||
return server.getCommandMap();
|
||||
}
|
||||
|
@ -24,10 +24,10 @@ index 0b6299a586e25f97eb734e650728e50d19ad16ce..308d9cd655c37e8a00bb053ecd2ba245
|
|||
|
||||
@NotNull
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index 797ff4d2b16fba1a423c8dc247fde0ad9199b5c1..51d7ec1b9ede6a1fe11d1bddc7a58213add72cbc 100644
|
||||
index 30252583c457a1afafa4172321e13673fb19c08f..07146beb9009e7f631905db0c86a4f4a048039da 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1670,4 +1670,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
@@ -1682,4 +1682,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
@NotNull
|
||||
Spigot spigot();
|
||||
// Spigot end
|
||||
|
@ -85,10 +85,10 @@ index 50cc311be7904cc8fc6070a21c8e4de3a489fd20..c62da4131b17e66892678e8b618fb9ba
|
|||
}
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||
index c2c49ee9b5531bc4761d2da54cd707c57fc647bf..2d27dfb859c312d46a14d0356c7c3f227e965a67 100644
|
||||
index 1fbf690403eefe017b146c141c6d47d9b8d9d4bb..3ffe519b759f440f56f3054b0d3e4120b59f8c62 100644
|
||||
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||
@@ -895,4 +895,13 @@ public final class SimplePluginManager implements PluginManager {
|
||||
@@ -905,4 +905,13 @@ public final class SimplePluginManager implements PluginManager {
|
||||
public void useTimings(boolean use) {
|
||||
co.aikar.timings.Timings.setTimingsEnabled(use); // Paper
|
||||
}
|
|
@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases
|
|||
Reload the aliases stored in commands.yml
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index 308d9cd655c37e8a00bb053ecd2ba2450555158f..356a270e9f831e21dc7fd947c2bec72e0840145a 100644
|
||||
index 0a2fc619ec9f28b43920cedcd18b75edfa66a36b..2c94d2adfe6de1ea4d7d6d8f169e19f3cc0a9f08 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -1897,6 +1897,15 @@ public final class Bukkit {
|
||||
@@ -1911,6 +1911,15 @@ public final class Bukkit {
|
||||
public static void reloadPermissions() {
|
||||
server.reloadPermissions();
|
||||
}
|
||||
|
@ -26,10 +26,10 @@ index 308d9cd655c37e8a00bb053ecd2ba2450555158f..356a270e9f831e21dc7fd947c2bec72e
|
|||
|
||||
@NotNull
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index 51d7ec1b9ede6a1fe11d1bddc7a58213add72cbc..c0bd764744b101856ef4fa068b5218688b156ecf 100644
|
||||
index 07146beb9009e7f631905db0c86a4f4a048039da..2b1c1fc275ce773f87a669c858ab00108cd0e39b 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1672,4 +1672,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
@@ -1684,4 +1684,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
// Spigot end
|
||||
|
||||
void reloadPermissions(); // Paper
|
|
@ -6,10 +6,10 @@ Subject: [PATCH] Add configuration option to prevent player names from being
|
|||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index 356a270e9f831e21dc7fd947c2bec72e0840145a..282bd71697aff52d43bce0a3543a3ec50a5b7b1b 100644
|
||||
index 2c94d2adfe6de1ea4d7d6d8f169e19f3cc0a9f08..675f3d9c5213eb55cb10064c6df339e1d301989e 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -1906,6 +1906,16 @@ public final class Bukkit {
|
||||
@@ -1920,6 +1920,16 @@ public final class Bukkit {
|
||||
public static boolean reloadCommandAliases() {
|
||||
return server.reloadCommandAliases();
|
||||
}
|
||||
|
@ -27,10 +27,10 @@ index 356a270e9f831e21dc7fd947c2bec72e0840145a..282bd71697aff52d43bce0a3543a3ec5
|
|||
|
||||
@NotNull
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index c0bd764744b101856ef4fa068b5218688b156ecf..2de18d69ad80fe872b36a4975b354cb144b3a302 100644
|
||||
index 2b1c1fc275ce773f87a669c858ab00108cd0e39b..50c0fc0eb2c3fb7aec23594453e1b51264b83758 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1674,4 +1674,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
@@ -1686,4 +1686,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
void reloadPermissions(); // Paper
|
||||
|
||||
boolean reloadCommandAliases(); // Paper
|
|
@ -6,10 +6,10 @@ Subject: [PATCH] Fix upstream javadocs
|
|||
Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues.
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index 282bd71697aff52d43bce0a3543a3ec50a5b7b1b..fa3cd5395ec29d7c51c792720acbb2394f238c45 100644
|
||||
index 675f3d9c5213eb55cb10064c6df339e1d301989e..94c7ede642fa11d9065b494745ca23c8657b0616 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -1163,6 +1163,8 @@ public final class Bukkit {
|
||||
@@ -1177,6 +1177,8 @@ public final class Bukkit {
|
||||
|
||||
/**
|
||||
* Gets every player that has ever played on this server.
|
||||
|
@ -19,10 +19,10 @@ index 282bd71697aff52d43bce0a3543a3ec50a5b7b1b..fa3cd5395ec29d7c51c792720acbb239
|
|||
* @return an array containing all previous players
|
||||
*/
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index 2de18d69ad80fe872b36a4975b354cb144b3a302..d1e5e679e0a7482a87a9a049ed0ce5c1b9891c90 100644
|
||||
index 50c0fc0eb2c3fb7aec23594453e1b51264b83758..5b38517a366d4e695b7d4ea7af8177660b79b32b 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -980,6 +980,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
@@ -992,6 +992,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
|
||||
/**
|
||||
* Gets every player that has ever played on this server.
|
|
@ -267,10 +267,10 @@ index 0000000000000000000000000000000000000000..7b3b6ef533d32169fbeca389bd61cfc6
|
|||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index fa3cd5395ec29d7c51c792720acbb2394f238c45..6c7b1e172a9acc881ecade6543245e8a64e251f6 100644
|
||||
index 94c7ede642fa11d9065b494745ca23c8657b0616..621a6e09322de838a9d7de481a32f458e351d814 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -1918,6 +1918,40 @@ public final class Bukkit {
|
||||
@@ -1932,6 +1932,40 @@ public final class Bukkit {
|
||||
public static boolean suggestPlayerNamesWhenNullTabCompletions() {
|
||||
return server.suggestPlayerNamesWhenNullTabCompletions();
|
||||
}
|
||||
|
@ -312,10 +312,10 @@ index fa3cd5395ec29d7c51c792720acbb2394f238c45..6c7b1e172a9acc881ecade6543245e8a
|
|||
|
||||
@NotNull
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index d1e5e679e0a7482a87a9a049ed0ce5c1b9891c90..8021598d78170ea1676cf21bac63858528398f53 100644
|
||||
index 5b38517a366d4e695b7d4ea7af8177660b79b32b..e9945187a8af2688dae2eeb007a2a16bd5e88560 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1685,5 +1685,33 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
@@ -1697,5 +1697,33 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
* @return true if player names should be suggested
|
||||
*/
|
||||
boolean suggestPlayerNamesWhenNullTabCompletions();
|
|
@ -9,7 +9,7 @@ on the real tile entity.
|
|||
This is useful for where performance is needed
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
|
||||
index da0964b1b6555ad50cb2ee47f13a7b9dfb1ab6aa..3ca05a6e86a5329cf452041eac476e3636eec34a 100644
|
||||
index ce1e1e6cc6740d568fbf859c7e2c014fab5a59cd..62ab55729e69bfac8eb4b40d877b945d95df27cd 100644
|
||||
--- a/src/main/java/org/bukkit/block/Block.java
|
||||
+++ b/src/main/java/org/bukkit/block/Block.java
|
||||
@@ -271,6 +271,16 @@ public interface Block extends Metadatable {
|
|
@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..7b2af1bd72dfbcf4e962a982940fc49b
|
|||
+
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||
index 0dae92b41684e9c2ada74d8987f922db04a419ca..34445011ccd22753a345dfc1ff87e01d2432654c 100644
|
||||
index 4771a1537646217ad0836f7d5ed62940339b44c6..a0782b81e787630cb45b38a863f1e98506014735 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -36,7 +36,7 @@ import org.jetbrains.annotations.Nullable;
|
|
@ -9,10 +9,10 @@ In Offline Mode, will return an Offline UUID
|
|||
This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index 6c7b1e172a9acc881ecade6543245e8a64e251f6..b0457e7740dda723b6eda481bcea3560d55333f1 100644
|
||||
index 621a6e09322de838a9d7de481a32f458e351d814..832b3f72c4a314dc0f38d412bdc999508f7d2b7b 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -559,6 +559,20 @@ public final class Bukkit {
|
||||
@@ -573,6 +573,20 @@ public final class Bukkit {
|
||||
return server.getPlayer(id);
|
||||
}
|
||||
|
||||
|
@ -34,10 +34,10 @@ index 6c7b1e172a9acc881ecade6543245e8a64e251f6..b0457e7740dda723b6eda481bcea3560
|
|||
* Gets the plugin manager for interfacing with plugins.
|
||||
*
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index 8021598d78170ea1676cf21bac63858528398f53..44a5e05fbc00aa878cd31879677d0aad779eb175 100644
|
||||
index e9945187a8af2688dae2eeb007a2a16bd5e88560..58e347f771b85c6bfbb06690f6a80fffaf1538f6 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -477,6 +477,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
@@ -489,6 +489,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
@Nullable
|
||||
public Player getPlayer(@NotNull UUID id);
|
||||
|
|
@ -66,10 +66,10 @@ index 41e26451fe12d8e6e0ef73c85731b24b4e3f200c..0d1b20f2b5580ea5505ccc2f003925db
|
|||
* Gets a {@link Permission} from its fully qualified name
|
||||
*
|
||||
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||
index 2d27dfb859c312d46a14d0356c7c3f227e965a67..7867243a8ed67416895cdcd949ac424f5d29d98b 100644
|
||||
index 3ffe519b759f440f56f3054b0d3e4120b59f8c62..c43d819bae5bc51bcf57a575bc22aee9d501c562 100644
|
||||
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||
@@ -498,6 +498,21 @@ public final class SimplePluginManager implements PluginManager {
|
||||
@@ -508,6 +508,21 @@ public final class SimplePluginManager implements PluginManager {
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -92,7 +92,7 @@ index 2d27dfb859c312d46a14d0356c7c3f227e965a67..7867243a8ed67416895cdcd949ac424f
|
|||
public void disablePlugin(@NotNull final Plugin plugin) {
|
||||
if (plugin.isEnabled()) {
|
||||
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||||
index b7cd98f20de3421cd3b8a95cfa2155fa77afa8b1..7483ceff298cafa244bd99316a0338aa075267d4 100644
|
||||
index 0cbac77e16fc36d805b79dd44837a38a79618c0b..47b306929654855944b1e95f81c641dea6102096 100644
|
||||
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||||
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||||
@@ -366,6 +366,7 @@ public final class JavaPluginLoader implements PluginLoader {
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue