spigot-mirror/spigot
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/spigot.git synced 2025-09-18 21:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Catch async command dispatch

Browse source
This commit is contained in:
md_5 2018-07-18 12:36:24 +10:00
parent 11bdb291b3
commit 83d9d09afb
15 changed files with 60 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
CraftBukkit-Patches/0007-Async-Operation-Catching.patch
View file

@ -1,4 +1,4 @@
From 9709b1f9c83f55c35014d4d8ba15bad25af6c1b7 Mon Sep 17 00:00:00 2001
From 18d7b08dba86af0a209d70831f52d4f0cf4cb6c2 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 25 Mar 2014 16:10:01 +1100
Subject: [PATCH] Async Operation Catching
@ -114,6 +114,18 @@ index 539e5a5f..b88c35c8 100644
// CraftBukkit start
// this.entityList.addAll(collection);
Iterator iterator = collection.iterator();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index ea56af0f..b8705cc7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -668,6 +668,7 @@ public final class CraftServer implements Server {
public boolean dispatchCommand(CommandSender sender, String commandLine) {
Validate.notNull(sender, "Sender cannot be null");
Validate.notNull(commandLine, "CommandLine cannot be null");
+ org.spigotmc.AsyncCatcher.catchOp( "command dispatch" ); // Spigot
if (commandMap.dispatch(sender, commandLine)) {
return true;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index dbcced1a..c6faa4bf 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java

14
CraftBukkit-Patches/0009-Spigot-Timings.patch
View file

@ -1,4 +1,4 @@
From 48235d6e81492997add41f41603d3df78c325a9f Mon Sep 17 00:00:00 2001
From 670894b71def3742b01bd9a938fd057adf1cad47 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Spigot Timings
@ -343,10 +343,10 @@ index 7dacad68..d000f5bf 100644
this.methodProfiler.e();
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 1dd5b9f5..6478eddf 100644
index 26c369f6..c30f25e4 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1553,6 +1553,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1558,6 +1558,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
// CraftBukkit end
private void handleCommand(String s) {
@ -354,7 +354,7 @@ index 1dd5b9f5..6478eddf 100644
// CraftBukkit start - whole method
this.LOGGER.info(this.player.getName() + " issued server command: " + s);
@@ -1562,6 +1563,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1567,6 +1568,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
this.server.getPluginManager().callEvent(event);
if (event.isCancelled()) {
@ -362,7 +362,7 @@ index 1dd5b9f5..6478eddf 100644
return;
}
@@ -1573,6 +1575,8 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1578,6 +1580,8 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
player.sendMessage(org.bukkit.ChatColor.RED + "An internal error occurred while attempting to perform this command");
java.util.logging.Logger.getLogger(PlayerConnection.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
return;
@ -556,10 +556,10 @@ index 7f50d5c7..1adbdbec 100644
public boolean j_() {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index ea56af0f..3bc2b781 100644
index b8705cc7..259712fc 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1791,6 +1791,11 @@ public final class CraftServer implements Server {
@@ -1792,6 +1792,11 @@ public final class CraftServer implements Server {
private final Spigot spigot = new Spigot()
{

6
CraftBukkit-Patches/0018-Close-Unloaded-Save-Files.patch
View file

@ -1,4 +1,4 @@
From 00863eaa00443ae1c418cccc12162fefff1a86ce Mon Sep 17 00:00:00 2001
From 46f3801536e6de2150414265d687446c9469118f Mon Sep 17 00:00:00 2001
From: Antony Riley <antony@cyberiantiger.org>
Date: Wed, 27 Mar 2013 01:41:54 +0200
Subject: [PATCH] Close Unloaded Save Files
@ -18,10 +18,10 @@ index 2c59f17f..d394645a 100644
public static synchronized RegionFile a(File file, int i, int j) {
File file1 = new File(file, "region");
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3bc2b781..5b4ca937 100644
index 259712fc..01ee1917 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1020,6 +1020,31 @@ public final class CraftServer implements Server {
@@ -1021,6 +1021,31 @@ public final class CraftServer implements Server {
worlds.remove(world.getName().toLowerCase(java.util.Locale.ENGLISH));
console.worlds.remove(console.worlds.indexOf(handle));

6
CraftBukkit-Patches/0022-Allow-Disabling-of-Command-Logging.patch
View file

@ -1,14 +1,14 @@
From bcbfbde576277f9c888d0765c3b46148cf6e7c8d Mon Sep 17 00:00:00 2001
From 6f3e9cd543c0aeb526f4a4611d20f246e7f6cb5c Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:01:29 +1000
Subject: [PATCH] Allow Disabling of Command Logging
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 6478eddf..69098039 100644
index c30f25e4..964f3346 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1555,6 +1555,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1560,6 +1560,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
private void handleCommand(String s) {
org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.startTiming(); // Spigot
// CraftBukkit start - whole method

6
CraftBukkit-Patches/0023-Allow-Disabling-of-Command-TabComplete.patch
View file

@ -1,4 +1,4 @@
From 510f1539619f79e313ada17fab4d2a0b02a04221 Mon Sep 17 00:00:00 2001
From 7971bbc1414ed5dbd1c392e83f1a4febb7fba197 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:05:54 +1000
Subject: [PATCH] Allow Disabling of Command TabComplete
@ -25,10 +25,10 @@ index ca64db53..f9b0cef2 100644
if (commandnode2.canUse(commandlistenerwrapper)) {
ArgumentBuilder argumentbuilder = commandnode2.createBuilder();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 5b4ca937..aaafa62e 100644
index 01ee1917..133e833c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1610,6 +1610,13 @@ public final class CraftServer implements Server {
@@ -1611,6 +1611,13 @@ public final class CraftServer implements Server {
}
public List<String> tabCompleteCommand(Player player, String message, WorldServer world, Vec3D pos) {

6
CraftBukkit-Patches/0024-Configurable-Messages.patch
View file

@ -1,4 +1,4 @@
From bc74a42e4b51f2a9aaebc2ffb416842f69a3df77 Mon Sep 17 00:00:00 2001
From ea83668bfd97e9d6afe998ae05c6eb95cb15ffea Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 19:21:58 +1000
Subject: [PATCH] Configurable Messages
@ -45,10 +45,10 @@ index 77af1442..80ac1481 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index aaafa62e..19b10aba 100644
index 133e833c..44341e2c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -673,11 +673,11 @@ public final class CraftServer implements Server {
@@ -674,11 +674,11 @@ public final class CraftServer implements Server {
return true;
}

6
CraftBukkit-Patches/0027-Disallow-Interaction-With-Self.patch
View file

@ -1,14 +1,14 @@
From 660e329625ef287711509f1cf16e84af03fbf51a Mon Sep 17 00:00:00 2001
From beeb351cc84051e7c22f0cc04178f70f5906b8dd Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 28 Jun 2013 19:52:54 +1000
Subject: [PATCH] Disallow Interaction With Self
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 69098039..6761bced 100644
index 964f3346..15510540 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1717,6 +1717,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1722,6 +1722,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
if (this.player.isFrozen()) return; // CraftBukkit
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
Entity entity = packetplayinuseentity.a((World) worldserver);

6
CraftBukkit-Patches/0037-Watchdog-Thread.patch
View file

@ -1,4 +1,4 @@
From 9ed65ab55aaea30ea76154dd534bca6a02d35c2f Mon Sep 17 00:00:00 2001
From 680cffea3e50b4da3686449c4d19658d8507b1f0 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 5 Aug 2014 17:20:19 +0100
Subject: [PATCH] Watchdog Thread.
@ -38,10 +38,10 @@ index be3d54ee..f2b4462b 100644
org.spigotmc.CustomTimingsHandler.tick(); // Spigot
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 19b10aba..3d6c4d7c 100644
index 44341e2c..ac0a447f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1828,6 +1828,11 @@ public final class CraftServer implements Server {
@@ -1829,6 +1829,11 @@ public final class CraftServer implements Server {
{
return org.spigotmc.SpigotConfig.config;
}

6
CraftBukkit-Patches/0057-Spam-Filter-Exclusions.patch
View file

@ -1,14 +1,14 @@
From b68674e40307aabc1a139e262de174aa7de30911 Mon Sep 17 00:00:00 2001
From 4adbd8d0309b8209cd322a623c5daae423e997a4 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 8 Feb 2014 08:13:40 +0000
Subject: [PATCH] Spam Filter Exclusions
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index f016681f..ec6225d1 100644
index 061a816a..042fd7a9 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1461,9 +1461,20 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1466,9 +1466,20 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
this.minecraftServer.getPlayerList().sendMessage(chatmessage, false);
}

8
CraftBukkit-Patches/0068-Descriptive-kick-reasons-instead-of-Nope.patch
View file

@ -1,11 +1,11 @@
From 03eaa91ba33c2678c70bfbb9f67cbf29177b3798 Mon Sep 17 00:00:00 2001
From c6fd66205123623fbc11f1fefea3a2e8d418ab04 Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sat, 15 Mar 2014 01:30:05 -0400
Subject: [PATCH] Descriptive kick reasons instead of Nope!
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 9d116c94..30b5500e 100644
index 2a951592..015959b9 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -289,7 +289,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
@ -27,10 +27,10 @@ index 9d116c94..30b5500e 100644
f1 = 0;
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index ec6225d1..264b79b0 100644
index 042fd7a9..90523669 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1382,7 +1382,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1387,7 +1387,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
this.player.resetIdleTimer();
} else {
PlayerConnection.LOGGER.warn("{} tried to set an invalid carried item", this.player.getDisplayName().getString());

6
CraftBukkit-Patches/0076-Check-for-blank-OfflinePlayer-Names.patch
View file

@ -1,14 +1,14 @@
From fbef59e2ccec732676256ad7fff59b580f8c84ee Mon Sep 17 00:00:00 2001
From 2aa66135e5d0e1f6cf2b4b4c2f30f674578c0df9 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 14 Apr 2014 17:21:24 +1000
Subject: [PATCH] Check for blank OfflinePlayer Names
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 16ac7290..01525b63 100644
index 77b5898b..8c6fa46e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1328,6 +1328,7 @@ public final class CraftServer implements Server {
@@ -1329,6 +1329,7 @@ public final class CraftServer implements Server {
@Deprecated
public OfflinePlayer getOfflinePlayer(String name) {
Validate.notNull(name, "Name cannot be null");

6
CraftBukkit-Patches/0087-Process-conversation-input-on-the-main-thread.-Fixes.patch
View file

@ -1,4 +1,4 @@
From 64ae16762e3066d94c8e11d2ac55c1e851b129ec Mon Sep 17 00:00:00 2001
From 1c947a1f98c1d6036a2273172df396cceb0ebc78 Mon Sep 17 00:00:00 2001
From: riking <rikingcoding@gmail.com>
Date: Wed, 14 May 2014 13:46:48 -0700
Subject: [PATCH] Process conversation input on the main thread. Fixes
@ -6,10 +6,10 @@ Subject: [PATCH] Process conversation input on the main thread. Fixes
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 264b79b0..6108054d 100644
index 90523669..0018538b 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1446,7 +1446,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1451,7 +1451,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
} else if (s.isEmpty()) {
LOGGER.warn(this.player.getName() + " tried to send an empty message");
} else if (getPlayer().isConversing()) {

6
CraftBukkit-Patches/0104-Only-fetch-an-online-UUID-in-online-mode.patch
View file

@ -1,4 +1,4 @@
From db4c7cfde6541f81950269593e956ac9d55da4b7 Mon Sep 17 00:00:00 2001
From af73c3f48c1dd307a38be3ba52ee48f2a861edcc Mon Sep 17 00:00:00 2001
From: Maxim Van de Wynckel <maxim_vdw@hotmail.com>
Date: Wed, 30 Jul 2014 01:19:51 +0200
Subject: [PATCH] Only fetch an online UUID in online mode
@ -12,10 +12,10 @@ You want to store data for player "Test" who never joined. An online UUID is cr
The player Test joins with an offline UUID but that will not match the online UUID of the saved data.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 01525b63..b74f7890 100644
index 8c6fa46e..dcdcf8c8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1332,8 +1332,14 @@ public final class CraftServer implements Server {
@@ -1333,8 +1333,14 @@ public final class CraftServer implements Server {
OfflinePlayer result = getPlayerExact(name);
if (result == null) {

6
CraftBukkit-Patches/0114-BungeeCord-Chat-API.patch
View file

@ -1,4 +1,4 @@
From fb236d6c9432d698a078a56fdb7daa4d18eb7ea0 Mon Sep 17 00:00:00 2001
From 5211059a95ab4ee44e3c865bb2dec6c21873eafc Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 13 Dec 2014 03:06:05 +0100
Subject: [PATCH] BungeeCord Chat API
@ -32,7 +32,7 @@ index e55384e7..28a26283 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b74f7890..8b118e81 100644
index dcdcf8c8..ce5ebcc5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -149,6 +149,7 @@ import org.bukkit.craftbukkit.tag.CraftBlockTag;
@ -43,7 +43,7 @@ index b74f7890..8b118e81 100644
public final class CraftServer implements Server {
private final String serverName = "CraftBukkit";
@@ -1858,6 +1859,20 @@ public final class CraftServer implements Server {
@@ -1859,6 +1860,20 @@ public final class CraftServer implements Server {
public void restart() {
org.spigotmc.RestartCommand.restart();
}

6
CraftBukkit-Patches/0119-Clear-Packet-Queue-on-Disconnect.patch
View file

@ -1,4 +1,4 @@
From a416b04e2804a4de7404804c5dc02b48492377ad Mon Sep 17 00:00:00 2001
From e238cfa856014756a5b4ed866c5de10d1767a718 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 22 Jul 2015 19:04:37 +1000
Subject: [PATCH] Clear Packet Queue on Disconnect
@ -17,10 +17,10 @@ index 79c24d2c..5b0d83a1 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index ba132a28..3cb86829 100644
index 3372565a..d11a30cc 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1366,7 +1366,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1371,7 +1371,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
}
// CraftBukkit start