Commit graph

254 commits

Author SHA1 Message Date
Spigot
ae20c1bdc6 Fix disabled netty again
By: md_5 <md_5@live.com.au>
2013-04-24 21:40:04 +10:00
Spigot
7c326a3a91 Correctly register pending connection when using legacy network handler.
By: md_5 <md_5@live.com.au>
2013-04-23 19:07:40 +10:00
Spigot
24ba405027 Set TCP nodelay to false for Netty
By: md_5 <md_5@live.com.au>
2013-04-23 18:44:49 +10:00
Spigot
6adbf80f04 Add thread naes to their own patch.
By: md_5 <md_5@live.com.au>
2013-04-23 11:50:42 +10:00
Spigot
9ef540adb1 Remove extra inventory close event patch, because despite being a legitimate bug fix, it will not be pulled by Bukkit, so plugins must resort to other means to catch this last event.
By: md_5 <md_5@live.com.au>
2013-04-23 11:37:51 +10:00
Spigot
cde5a715a3 FIx spacing
By: md_5 <md_5@live.com.au>
2013-04-23 11:35:18 +10:00
Spigot
2a38426e59 Move version resolve check to initial POM patch
By: md_5 <md_5@live.com.au>
2013-04-23 11:32:07 +10:00
Spigot
d4c6c0b527 Move IP filter to own patch and (messily) fix merge conflicts as a result.
By: md_5 <md_5@live.com.au>
2013-04-23 11:27:55 +10:00
Spigot
73650d09a1 Go back to the chunk based count caching for now to avoid mob spawning issues
By: Ammar Askar <ammar@ammaraskar.com>
2013-04-22 03:47:35 +05:00
Spigot
a5e12866f3 Fix world info showing world as always obfuscated
By: md_5 <md_5@live.com.au>
2013-04-21 20:02:08 +10:00
Spigot
61c89efb5c Revert "Readd previous Netty tweaks, the memory leak has been fixed"
This reverts commit 8f58b1d272.

By: md_5 <md_5@live.com.au>
2013-04-21 10:21:35 +10:00
Spigot
8f58b1d272 Readd previous Netty tweaks, the memory leak has been fixed
By: md_5 <md_5@live.com.au>
2013-04-21 08:53:15 +10:00
Spigot
f6de336307 Revert "Dramatically reduce the idle network activity by collecting and framing packets for a max of 10 milliseconds. This reduces bandwidth consumption as much as possible whilst not generating network garbage and other nasties."
This reverts commit bde545c82a.

By: md_5 <md_5@live.com.au>
2013-04-21 08:39:39 +10:00
Spigot
a4744b484b Revert "20 ms works too, anything higher is a bit shifty"
This reverts commit 912c07129b.

By: md_5 <md_5@live.com.au>
2013-04-21 08:39:36 +10:00
Spigot
c95fb0a34a Take the count mapping one step further by removing chunk traversal for count seeking altogether
By: Ammar Askar <ammar@ammaraskar.com>
2013-04-21 00:25:59 +05:00
Spigot
912c07129b 20 ms works too, anything higher is a bit shifty
By: md_5 <md_5@live.com.au>
2013-04-20 19:50:59 +10:00
Spigot
bde545c82a Dramatically reduce the idle network activity by collecting and framing packets for a max of 10 milliseconds. This reduces bandwidth consumption as much as possible whilst not generating network garbage and other nasties.
By: md_5 <md_5@live.com.au>
2013-04-20 19:41:41 +10:00
Spigot
9160931859 Store creature counts to avoid repeated assignable checks and traversal of entity slices
By: Ammar Askar <ammar@ammaraskar.com>
2013-04-20 13:50:09 +05:00
Spigot
adb850995c Java 5/6 compat. NETBEANS!
By: md_5 <md_5@live.com.au>
2013-04-20 17:14:54 +10:00
Spigot
09f1566b74 Oops.
By: md_5 <md_5@live.com.au>
2013-04-19 21:07:42 +10:00
Spigot
acde9aa408 Welcome back snapshot protocol patch! Now 30% more reliable than a leading brand of car cleaner! Testers welcome <3
By: md_5 <md_5@live.com.au>
2013-04-19 19:14:11 +10:00
Spigot
a4b017945b [Experimental] Add connection multiplexer to allow many listen blocks. Secondary listen blocks are configured in bukkit.yml
By: md_5 <md_5@live.com.au>
2013-04-19 17:45:39 +10:00
Spigot
70056940b6 Implement a "proper" connection throttle for netty.
Proper meaning a simple portover from CraftBukkit's implementation.

The last implementation had a few issues:
- For each server ping, the connection was getting throttled.
- ConcurrentHashMap is heavy (More of an opinion but don't judge)

From the last implementation, the connection throttle entry (your IP) wasn't getting removed from the list after a server ping, which is supposed to happen according to the original implementation.

By: SuPaH sPii <r29jk10@gmail.com>
2013-04-18 13:27:29 -05:00
Spigot
b5080a172f Yet another CraftBukkit pulled patch.
By: md_5 <md_5@live.com.au>
2013-04-16 18:36:22 +10:00
Spigot
bca4cb4cf2 Changed minimum characters to 2 for validity check
By: Ammar Askar <ammar@ammaraskar.com>
2013-04-14 21:32:19 +05:00
Spigot
ed656bfa7c Fix first connect mostly failing because it is apparently that big of an issue for some people.
By: md_5 <md_5@live.com.au>
2013-04-14 19:33:56 +10:00
Spigot
be538d0404 Use Pattern
By: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
2013-04-14 03:25:35 +01:00
Spigot
426b72713f Prevent handshake spam from invalid names.
By: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
2013-04-14 03:09:29 +01:00
Spigot
2755113f87 Now that thats out the way..
By: md_5 <md_5@live.com.au>
2013-04-13 17:14:56 +10:00
Spigot
4d0077a0cf Re add ping sending patch
By: md_5 <md_5@live.com.au>
2013-04-13 17:11:24 +10:00
Spigot
ece477d0c7 Remove a fair chunk of existing patches now applied to CraftBukkit
By: md_5 <md_5@live.com.au>
2013-04-13 17:06:23 +10:00
Spigot
b4464fc721 Update netty & kindof hacky fix for anvil mishaps
By: md_5 <md_5@live.com.au>
2013-04-12 13:57:00 +10:00
Spigot
d646a97d30 Add @hidendra 's pulls
By: md_5 <md_5@live.com.au>
2013-04-10 17:03:17 +10:00
Spigot
8e28115981 Add written bytes tracking for @bergerkiller
By: md_5 <md_5@live.com.au>
2013-04-10 16:37:43 +10:00
Spigot
a893386a86 Remove stats completely from patches.
By: md_5 <md_5@live.com.au>
2013-04-10 14:08:33 +10:00
Spigot
f5b1669094 Fix patches.
By: md_5 <md_5@live.com.au>
2013-04-10 14:06:41 +10:00
Spigot
b8055fe033 [Cosmetic] Update patches to be generated with latest stable git.
By: md_5 <md_5@live.com.au>
2013-04-10 12:36:11 +10:00
Spigot
fdf667b0d7 Update 0038-Entity-Tracking-Ranges.patch
monsterEntityActivationRange -> monsterTrackingRange
By: Bestle <tom.roberts00@gmail.com>
2013-04-09 02:00:09 +02:00
Spigot
f1e5b66f43 Fixes boat dupe
By: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
2013-04-05 18:24:55 +01:00
Spigot
4f67a6e4bc Fix oreobfuscator patch
By: Ammar Askar <ammar@ammaraskar.com>
2013-04-04 16:08:00 +05:00
Spigot
ce23b8892d Update for upstream version change
By: Ammar Askar <ammar@ammaraskar.com>
2013-04-04 15:58:51 +05:00
Spigot
5e8546e86a Fix update radius, so I can update my radius to see ores
very far away for no apparent reason I type this very long
 commit message that serves nobody elses purpose except
 Bacon ipsum dolor sit amet pancetta kielbasa turducken
 boudin. Andouille fatback doner hamburger t-bone beef
 brisket chicken turkey. Prosciutto sausage drumstick
 kielbasa, jerky ham tongue brisket venison pork loin
 fatback chuck. Drumstick short loin biltong tenderloin,
 tongue hamburger swine chicken bresaola doner filet mignon.
 Kielbasa jowl filet mignon boudin shankle pork. Capicola
 tri-tip venison, ham hock sirloin filet mignon chuck ham
 pork belly pastrami jerky prosciutto.

By: SuPaH sPii <r29jk10@gmail.com>
2013-04-03 17:10:41 -05:00
Spigot
08676f42a0 revert changes to disabled plugins and scheduler.
sorry for messy commit,doing via tablet on ssh
md_5

By: Hudson <hudson@mydomain.com>
2013-04-03 02:20:29 -05:00
Spigot
8a5e0d161a Revert commit 61b50f8d7d. Needs more testing.
By: Ammar Askar <ammar@ammaraskar.com>
2013-03-29 14:07:46 +05:00
Spigot
0f482a64ab Fix lightened nibble array getChunkSnapshot on extended block IDs
Fix out-of-bounds error in chunks with extended (4096) block IDs:

13:34:12 [SEVERE] [dynmap] Exception while fetching chunks:
java.lang.ArrayIndexOutOfBoundsException: 4096
    at org.bukkit.craftbukkit.v1_4_R1.CraftChunk.getChunkSnapshot(CraftChunk.java:1

http://pastie.org/6368930

Thanks to mikeprimm for this fix.

Original MCPC+ commit:
MinecraftPortCentral/MCPC-Plus@7902767397

By: Agaricus <agaricusb@yahoo.com>
2013-03-28 22:15:38 -07:00
Spigot
ca055f3ef9 Just send kick packet + dc players on restart. Don't actually kick them
By: md_5 <md_5@live.com.au>
2013-03-28 18:38:42 +11:00
Spigot
61b50f8d7d Implement connection throttling in netty.
By: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
2013-03-26 17:46:15 +00:00
Spigot
e7d7833da4 Check connected state before handling packets.
By: md_5 <md_5@live.com.au>
2013-03-26 12:09:44 +11:00
Spigot
4f5c561c9b Update to latest CB upstream.
By: md_5 <md_5@live.com.au>
2013-03-25 18:57:00 +11:00
Spigot
86ed9076ee Close Minecart containers on Entity portal.
By: md_5 <md_5@live.com.au>
2013-03-24 18:53:01 +11:00