mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-01 17:01:56 +01:00
API patches
This commit is contained in:
Nassim Jahnke
parent
1148687a8d
commit
66eb6f7632
381 changed files with 63 additions and 111 deletions
|
|
@ -91,11 +91,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
||||||
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
||||||
@@ -0,0 +0,0 @@ public class VersionCommand extends BukkitCommand {
|
@@ -0,0 +0,0 @@ public class VersionCommand extends BukkitCommand {
|
||||||
private void setVersionMessage(final @NotNull Component msg) {
|
private void setVersionMessage(final @NotNull net.kyori.adventure.text.Component msg) {
|
||||||
lastCheck = System.currentTimeMillis();
|
lastCheck = System.currentTimeMillis();
|
||||||
final Component message = net.kyori.adventure.text.TextComponent.ofChildren(
|
final net.kyori.adventure.text.Component message = net.kyori.adventure.text.TextComponent.ofChildren(
|
||||||
- Component.text("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")", net.kyori.adventure.text.format.NamedTextColor.WHITE),
|
- net.kyori.adventure.text.Component.text("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")", net.kyori.adventure.text.format.NamedTextColor.WHITE),
|
||||||
+ Component.text(Bukkit.getVersionMessage(), net.kyori.adventure.text.format.NamedTextColor.WHITE),
|
+ net.kyori.adventure.text.Component.text(Bukkit.getVersionMessage(), net.kyori.adventure.text.format.NamedTextColor.WHITE),
|
||||||
Component.newline(),
|
net.kyori.adventure.text.Component.newline(),
|
||||||
msg
|
msg
|
||||||
);
|
);
|
||||||
|
|
@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||||||
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||||||
@@ -0,0 +0,0 @@ public final class JavaPluginLoader implements PluginLoader {
|
@@ -0,0 +0,0 @@ public final class JavaPluginLoader implements PluginLoader {
|
||||||
Validate.isTrue(plugin instanceof JavaPlugin, "Plugin is not associated with this PluginLoader");
|
Preconditions.checkArgument(plugin instanceof JavaPlugin, "Plugin is not associated with this PluginLoader");
|
||||||
|
|
||||||
if (!plugin.isEnabled()) {
|
if (!plugin.isEnabled()) {
|
||||||
- plugin.getLogger().info("Enabling " + plugin.getDescription().getFullName());
|
- plugin.getLogger().info("Enabling " + plugin.getDescription().getFullName());
|
||||||
|
|
@ -68,8 +68,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
+ @NotNull
|
+ @NotNull
|
||||||
+ public Plugin[] loadPlugins(final @NotNull File directory, final @NotNull List<File> extraPluginJars) {
|
+ public Plugin[] loadPlugins(final @NotNull File directory, final @NotNull List<File> extraPluginJars) {
|
||||||
+ // Paper end
|
+ // Paper end
|
||||||
Validate.notNull(directory, "Directory cannot be null");
|
Preconditions.checkArgument(directory != null, "Directory cannot be null");
|
||||||
Validate.isTrue(directory.isDirectory(), "Directory must be a directory");
|
Preconditions.checkArgument(directory.isDirectory(), "Directory must be a directory");
|
||||||
|
|
||||||
@@ -0,0 +0,0 @@ public final class SimplePluginManager implements PluginManager {
|
@@ -0,0 +0,0 @@ public final class SimplePluginManager implements PluginManager {
|
||||||
Map<String, Collection<String>> softDependencies = new HashMap<String, Collection<String>>();
|
Map<String, Collection<String>> softDependencies = new HashMap<String, Collection<String>>();
|
||||||
|
|
@ -50,8 +50,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
--- a/src/main/java/org/bukkit/command/Command.java
|
--- a/src/main/java/org/bukkit/command/Command.java
|
||||||
+++ b/src/main/java/org/bukkit/command/Command.java
|
+++ b/src/main/java/org/bukkit/command/Command.java
|
||||||
@@ -0,0 +0,0 @@ public abstract class Command {
|
@@ -0,0 +0,0 @@ public abstract class Command {
|
||||||
Validate.notNull(args, "Arguments cannot be null");
|
Preconditions.checkArgument(args != null, "Arguments cannot be null");
|
||||||
Validate.notNull(alias, "Alias cannot be null");
|
Preconditions.checkArgument(alias != null, "Alias cannot be null");
|
||||||
|
|
||||||
- if (args.length == 0) {
|
- if (args.length == 0) {
|
||||||
+ if (args.length == 0 || !sender.getServer().suggestPlayerNamesWhenNullTabCompletions()) { // Paper - allow preventing player name suggestions by default) {
|
+ if (args.length == 0 || !sender.getServer().suggestPlayerNamesWhenNullTabCompletions()) { // Paper - allow preventing player name suggestions by default) {
|
||||||
|
|
@ -467,29 +467,18 @@ diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/j
|
||||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||||
+++ b/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;
|
|
||||||
import java.util.Iterator;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
+
|
|
||||||
+import com.destroystokyo.paper.event.server.ServerExceptionEvent;
|
|
||||||
+import com.destroystokyo.paper.exception.ServerCommandException;
|
|
||||||
+import com.destroystokyo.paper.exception.ServerTabCompleteException;
|
|
||||||
import org.apache.commons.lang.Validate;
|
|
||||||
import org.bukkit.Location;
|
|
||||||
import org.bukkit.Server;
|
|
||||||
@@ -0,0 +0,0 @@ public class SimpleCommandMap implements CommandMap {
|
@@ -0,0 +0,0 @@ public class SimpleCommandMap implements CommandMap {
|
||||||
target.execute(sender, sentCommandLabel, Arrays.copyOfRange(args, 1, args.length));
|
target.execute(sender, sentCommandLabel, Arrays.copyOfRange(args, 1, args.length));
|
||||||
} // target.timings.stopTiming(); // Spigot // Paper
|
} // target.timings.stopTiming(); // Spigot // Paper
|
||||||
} catch (CommandException ex) {
|
} catch (CommandException ex) {
|
||||||
+ server.getPluginManager().callEvent(new ServerExceptionEvent(new ServerCommandException(ex, target, sender, args))); // Paper
|
+ server.getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerCommandException(ex, target, sender, args))); // Paper
|
||||||
//target.timings.stopTiming(); // Spigot // Paper
|
//target.timings.stopTiming(); // Spigot // Paper
|
||||||
throw ex;
|
throw ex;
|
||||||
} catch (Throwable ex) {
|
} catch (Throwable ex) {
|
||||||
//target.timings.stopTiming(); // Spigot // Paper
|
//target.timings.stopTiming(); // Spigot // Paper
|
||||||
- throw new CommandException("Unhandled exception executing '" + commandLine + "' in " + target, ex);
|
- throw new CommandException("Unhandled exception executing '" + commandLine + "' in " + target, ex);
|
||||||
+ String msg = "Unhandled exception executing '" + commandLine + "' in " + target;
|
+ String msg = "Unhandled exception executing '" + commandLine + "' in " + target;
|
||||||
+ server.getPluginManager().callEvent(new ServerExceptionEvent(new ServerCommandException(ex, target, sender, args))); // Paper
|
+ server.getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerCommandException(ex, target, sender, args))); // Paper
|
||||||
+ throw new CommandException(msg, ex);
|
+ throw new CommandException(msg, ex);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -500,7 +489,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
} catch (Throwable ex) {
|
} catch (Throwable ex) {
|
||||||
- throw new CommandException("Unhandled exception executing tab-completer for '" + cmdLine + "' in " + target, ex);
|
- throw new CommandException("Unhandled exception executing tab-completer for '" + cmdLine + "' in " + target, ex);
|
||||||
+ String msg = "Unhandled exception executing tab-completer for '" + cmdLine + "' in " + target;
|
+ String msg = "Unhandled exception executing tab-completer for '" + cmdLine + "' in " + target;
|
||||||
+ server.getPluginManager().callEvent(new ServerExceptionEvent(new ServerTabCompleteException(msg, ex, target, sender, args))); // Paper
|
+ server.getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerTabCompleteException(msg, ex, target, sender, args))); // Paper
|
||||||
+ throw new CommandException(msg, ex);
|
+ throw new CommandException(msg, ex);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -509,17 +498,6 @@ diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main
|
||||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||||
+++ b/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;
|
|
||||||
import java.util.logging.Level;
|
|
||||||
import java.util.regex.Matcher;
|
|
||||||
import java.util.regex.Pattern;
|
|
||||||
+
|
|
||||||
+import com.destroystokyo.paper.event.server.ServerExceptionEvent;
|
|
||||||
+import com.destroystokyo.paper.exception.ServerEventException;
|
|
||||||
+import com.destroystokyo.paper.exception.ServerPluginEnableDisableException;
|
|
||||||
import org.apache.commons.lang.Validate;
|
|
||||||
import org.bukkit.Server;
|
|
||||||
import org.bukkit.World;
|
|
||||||
@@ -0,0 +0,0 @@ public final class SimplePluginManager implements PluginManager {
|
@@ -0,0 +0,0 @@ public final class SimplePluginManager implements PluginManager {
|
||||||
try {
|
try {
|
||||||
plugin.getPluginLoader().enablePlugin(plugin);
|
plugin.getPluginLoader().enablePlugin(plugin);
|
||||||
|
|
@ -580,7 +558,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
+ // Paper start
|
+ // Paper start
|
||||||
+ private void handlePluginException(String msg, Throwable ex, Plugin plugin) {
|
+ private void handlePluginException(String msg, Throwable ex, Plugin plugin) {
|
||||||
+ server.getLogger().log(Level.SEVERE, msg, ex);
|
+ server.getLogger().log(Level.SEVERE, msg, ex);
|
||||||
+ callEvent(new ServerExceptionEvent(new ServerPluginEnableDisableException(msg, ex, plugin)));
|
+ callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerPluginEnableDisableException(msg, ex, plugin)));
|
||||||
+ }
|
+ }
|
||||||
+ // Paper end
|
+ // Paper end
|
||||||
+
|
+
|
||||||
|
|
@ -595,8 +573,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
+ // Paper start - error reporting
|
+ // Paper start - error reporting
|
||||||
+ String msg = "Could not pass event " + event.getEventName() + " to " + registration.getPlugin().getDescription().getFullName();
|
+ String msg = "Could not pass event " + event.getEventName() + " to " + registration.getPlugin().getDescription().getFullName();
|
||||||
+ server.getLogger().log(Level.SEVERE, msg, ex);
|
+ server.getLogger().log(Level.SEVERE, msg, ex);
|
||||||
+ if (!(event instanceof ServerExceptionEvent)) { // We don't want to cause an endless event loop
|
+ if (!(event instanceof com.destroystokyo.paper.event.server.ServerExceptionEvent)) { // We don't want to cause an endless event loop
|
||||||
+ callEvent(new ServerExceptionEvent(new ServerEventException(msg, ex, registration.getPlugin(), registration.getListener(), event)));
|
+ callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerEventException(msg, ex, registration.getPlugin(), registration.getListener(), event)));
|
||||||
+ }
|
+ }
|
||||||
+ // Paper end
|
+ // Paper end
|
||||||
}
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue