core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disconnect for spam in the main thread

This commit is contained in:
Thinkofdeath 2014-01-03 17:32:20 +00:00
parent 9f71f7e3db
commit 885ae9871e
2 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CraftBukkit-Patches/0087-Add-Late-Bind-Option.patch → CraftBukkit-Patches/0086-Add-Late-Bind-Option.patch
View File

@ -1,4 +1,4 @@
From 8be2e6bb5953a4b90a6226546775e9746a65516e Mon Sep 17 00:00:00 2001
From 851a08e3828b82aa5833285611af33e71141a82d Mon Sep 17 00:00:00 2001
From: slide23 <me@slide.ws>
Date: Fri, 20 Dec 2013 20:15:33 -0600
Subject: [PATCH] Add Late Bind Option
@ -70,5 +70,5 @@ index 628533e..cb5002f
+ }
}
--
1.8.3.2
1.8.4.msysgit.0

42
CraftBukkit-Patches/0087-Disconnect-for-spam-in-the-main-thread.patch Normal file
View File

@ -0,0 +1,42 @@
From b8eba900197cdc6e9c71feff78e051292b3de6e5 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Fri, 3 Jan 2014 17:30:52 +0000
Subject: [PATCH] Disconnect for spam in the main thread
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 1903362..f7fdca3 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -838,7 +838,27 @@ public class PlayerConnection implements PacketPlayInListener {
// this.chatThrottle += 20;
if (chatSpamField.addAndGet(this, 20) > 200 && !this.minecraftServer.getPlayerList().isOp(this.player.getName())) {
// CraftBukkit end
- this.disconnect("disconnect.spam");
+ if (packetplayinchat.a()) { // Spigot - Thread safety
+ Waitable waitable = new Waitable() {
+ @Override
+ protected Object evaluate() {
+ PlayerConnection.this.disconnect( "disconnect.spam" );
+ return null;
+ }
+ };
+
+ this.minecraftServer.processQueue.add(waitable);
+
+ try {
+ waitable.get();
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ } catch (ExecutionException e) {
+ throw new RuntimeException(e);
+ }
+ } else {
+ PlayerConnection.this.disconnect( "disconnect.spam" );
+ }
}
}
}
--
1.8.4.msysgit.0