SteamWar/Paper
12
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
393 Commits 3 Branches 0 Tags
d4c6c0b5278cc1e37bdbc3264d48784ad34715b4
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 a6cd393659 Automatically update upstream versions. Bukkit-1.5.1-R0.2-1-g3395540, CraftBukkit-1.5.1-R0.2-5-g7fd3e34 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-04-16 07:21:46 -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 b1181168c6 Automatically update upstream versions. Bukkit-1.5.1-R0.2-1-g3395540, CraftBukkit-1.5.1-R0.2-4-g13c74c1 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-04-15 23:01:45 -05:00
Spigot e5413e27db Automatically update upstream versions. Bukkit-1.5.1-R0.2-1-g3395540, CraftBukkit-1.5.1-R0.2-2-gd1b72c3 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-04-15 22:11:53 -05: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 0a1086e010 Merge pull request #36 from TehRainbowGuy/invalid-name-fix 
Prevent handshake spam from invalid names.
By: md-5 <md_5@live.com.au>
 2013-04-13 19:45:07 -07: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 a0c2b2a887 Automatically update upstream versions. Bukkit-1.5.1-R0.1-13-g01aabbb, CraftBukkit-1.5.1-R0.1-21-g49b0699 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-04-13 01:51:18 -05:00
Spigot ea9d6bac4d Automatically update upstream versions. Bukkit-1.5.1-R0.1-12-gf569209, CraftBukkit-1.5.1-R0.1-20-gd37b640 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-04-13 01:41:17 -05:00
Spigot 4e583197de Automatically update upstream versions. Bukkit-1.5.1-R0.1-11-g2de99a4, CraftBukkit-1.5.1-R0.1-20-gd37b640 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-04-13 01:11:16 -05:00
Spigot a021730d71 Automatically update upstream versions. Bukkit-1.5.1-R0.1-11-g2de99a4, CraftBukkit-1.5.1-R0.1-19-gf5388e8 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-04-13 00:56:22 -05:00
Spigot a84d972c82 Automatically update upstream versions. Bukkit-1.5.1-R0.1-11-g2de99a4, CraftBukkit-1.5.1-R0.1-11-g98f726e 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-04-12 21:46:21 -05:00
Spigot de7845fc26 Automatically update upstream versions. Bukkit-1.5.1-R0.1-11-g2de99a4, CraftBukkit-1.5.1-R0.1-10-g07e33d0 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-04-12 20:31:19 -05:00
Spigot e11ba79676 Automatically update upstream versions. Bukkit-1.5.1-R0.1-10-g30a9758, CraftBukkit-1.5.1-R0.1-10-g07e33d0 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-04-12 16:36:22 -05:00
Spigot b8c9489391 Automatically update upstream versions. Bukkit-1.5.1-R0.1-9-g18c4648, CraftBukkit-1.5.1-R0.1-10-g07e33d0 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-04-11 23:31:24 -05: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 f245fd96f8 Automatically update upstream versions. Bukkit-1.5.1-R0.1-8-gbe14296, CraftBukkit-1.5.1-R0.1-8-gb87eac0 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-04-11 21:01:44 -05: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 c35e70ad7d Merge pull request #33 from Bestle/patch-1 
Update 0038-Entity-Tracking-Ranges.patch
By: md-5 <md_5@live.com.au>
 2013-04-08 17:06:03 -07: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 cbeb6f142c Merge pull request #30 from TehRainbowGuy/Boat-Dupe 
Fixes boat dupe
By: md-5 <md_5@live.com.au>
 2013-04-05 14:10:39 -07:00
Spigot f6377d176b Automatically update upstream versions. Bukkit-1.5.1-R0.1-8-gbe14296, CraftBukkit-1.5.1-R0.1-7-ge80e64d 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-04-05 12:56:17 -05:00
Spigot 3e19642544 Automatically update upstream versions. Bukkit-1.5.1-R0.1-7-g5ca534d, CraftBukkit-1.5.1-R0.1-7-ge80e64d 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-04-05 12:46:20 -05:00
Spigot f1e5b66f43 Fixes boat dupe 
By: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
 2013-04-05 18:24:55 +01:00
Spigot bd1328d084 Automatically update upstream versions. Bukkit-1.5.1-R0.1-6-g410bd30, CraftBukkit-1.5.1-R0.1-7-ge80e64d 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-04-04 23:41:19 -05:00
Spigot 5d55ef2b32 remove no longer applying / pulled meta patches 
By: md_5 <md_5@live.com.au>
 2013-04-04 22:52:57 -05:00
Spigot d0564221af Automatically update upstream versions. Bukkit-1.5.1-R0.1-6-g410bd30, CraftBukkit-1.5.1-R0.1-6-ge421b6a 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-04-04 22:29:19 -05: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 fb45519224 Update submodules 
By: Ammar Askar <ammar@ammaraskar.com>
 2013-04-04 15:39:35 +05:00
Spigot 364522c2ad Merge pull request #29 from SuperSpyTX/fkinggit 
Fix ore update radius 2 (the stupid git fixed version)
By: md-5 <md_5@live.com.au>
 2013-04-03 15:16:28 -07: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 fcfb1b5cb0 Automatically update upstream versions. Bukkit-1.4.7-R1.0-45-g409595c, CraftBukkit-1.4.7-R1.0-91-g5bbee6c 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-04-02 16:16:24 -05:00
Spigot 095cac3bd5 Automatically update upstream versions. Bukkit-1.4.7-R1.0-45-g409595c, CraftBukkit-1.4.7-R1.0-90-geb2d96b 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-04-01 23:21:17 -05:00
Spigot 7efd601fd6 Automatically update upstream versions. Bukkit-1.4.7-R1.0-44-g10c1edc, CraftBukkit-1.4.7-R1.0-90-geb2d96b 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-04-01 16:06:30 -05:00
Spigot 640ec8764c Automatically update upstream versions. Bukkit-1.4.7-R1.0-43-g9e614c1, CraftBukkit-1.4.7-R1.0-90-geb2d96b 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-04-01 00:11:21 -05:00
Spigot 3cb7cb6c8f Automatically update upstream versions. Bukkit-1.4.7-R1.0-43-g9e614c1, CraftBukkit-1.4.7-R1.0-89-g259b840 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-03-31 19:51:16 -05:00
Spigot 9d1aea2057 Automatically update upstream versions. Bukkit-1.4.7-R1.0-43-g9e614c1, CraftBukkit-1.4.7-R1.0-88-gb39ef5e 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-03-31 19:36:16 -05:00
Spigot 5831d58b6e Automatically update upstream versions. Bukkit-1.4.7-R1.0-42-g7c8d3d4, CraftBukkit-1.4.7-R1.0-88-gb39ef5e 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-03-31 19:26:20 -05:00
Spigot 5cb6e6ed09 Automatically update upstream versions. Bukkit-1.4.7-R1.0-41-gf30d89a, CraftBukkit-1.4.7-R1.0-86-g052e955 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-03-31 15:41:19 -05:00
Spigot b4781e76d3 Automatically update upstream versions. Bukkit-1.4.7-R1.0-41-gf30d89a, CraftBukkit-1.4.7-R1.0-85-g317e6b6 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-03-31 13:31:21 -05:00
Spigot 6ef4fe66f2 Automatically update upstream versions. Bukkit-1.4.7-R1.0-41-gf30d89a, CraftBukkit-1.4.7-R1.0-83-gb08af02 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-03-30 02:56:19 -05:00
Spigot e054e75379 Automatically update upstream versions. Bukkit-1.4.7-R1.0-41-gf30d89a, CraftBukkit-1.4.7-R1.0-82-g600f688 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-03-29 22:51:17 -05:00
Spigot 42506dace8 Automatically update upstream versions. Bukkit-1.4.7-R1.0-41-gf30d89a, CraftBukkit-1.4.7-R1.0-81-g7710efc 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-03-29 22:31:23 -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 2af9fed17b Merge pull request #27 from agaricusb/fix-nibblearray4096 
Fix lightened nibble array getChunkSnapshot on extended block IDs
By: md-5 <md_5@live.com.au>
 2013-03-28 23:10:04 -07: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 7ec36bb0a8 Automatically update upstream versions. Bukkit-1.4.7-R1.0-40-gced8459, CraftBukkit-1.4.7-R1.0-79-gb8f8ec0 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-03-28 21:21:13 -05:00
Spigot c1cc87f84f Automatically update upstream versions. Bukkit-1.4.7-R1.0-40-gced8459, CraftBukkit-1.4.7-R1.0-77-gaaaac47 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-03-28 20:16:09 -05:00
Spigot 9a0e180ae3 Automatically update upstream versions. Bukkit-1.4.7-R1.0-40-gced8459, CraftBukkit-1.4.7-R1.0-76-g0802c7e 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-03-28 19:46:13 -05: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 84aae259d2 Automatically update upstream versions. Bukkit-1.4.7-R1.0-40-gced8459, CraftBukkit-1.4.7-R1.0-75-g7f25632 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-03-27 20:32:06 -05:00
Spigot 9dcbec3ee6 Merge pull request #26 from TehRainbowGuy/dos 
Implement connection throttling in netty.
By: md-5 <md_5@live.com.au>
 2013-03-26 23:38:33 -07:00
Spigot 6ea08ae612 Automatically update upstream versions. Bukkit-1.4.7-R1.0-39-gc84d619, CraftBukkit-1.4.7-R1.0-75-g7f25632 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-03-26 15:35:14 -05: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 6de9424258 Automatically update upstream versions. Bukkit-1.4.7-R1.0-37-g9a0cafe, CraftBukkit-1.4.7-R1.0-69-gd9f4d57 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-03-25 01:57:57 -05: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
Spigot 4637794c28 Remove upstream pulled patch. 
By: md_5 <md_5@live.com.au>
 2013-03-24 10:59:27 +11:00
Spigot a28c2225c5 Automatically update upstream versions. Bukkit-1.4.7-R1.0-35-g34239ae, CraftBukkit-1.4.7-R1.0-63-gace8206 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-03-23 17:32:25 -05:00
Spigot 54f7e08c6e Revert second addition to boat sending patch. 
By: md_5 <md_5@live.com.au>
 2013-03-24 08:20:01 +11:00
Spigot 27dc70eba4 Remove patch for upstream merge 
By: Ammar Askar <ammar@ammaraskar.com>
 2013-03-23 23:37:23 +05:00
Spigot 36d6fb887f Automatically update upstream versions. Bukkit-1.4.7-R1.0-34-g46234ff, CraftBukkit-1.4.7-R1.0-62-g40cbc3d 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-03-23 12:06:45 -05:00
Spigot 3eb3f9463d Made the world info possible to turn off. 
By: totokaka <ttotokaka@gmail.com>
 2013-03-23 20:15:20 +11:00
Spigot 4644626cff No need to hard disable. Also tweak check to allow for 1 renderer customs 
By: md_5 <md_5@live.com.au>
 2013-03-23 20:09:17 +11:00
Spigot 023ba8e359 Compensate for CB always having its own renderer 
By: md_5 <md_5@live.com.au>
 2013-03-23 19:41:36 +11:00
Spigot 71535cee5a Also allow outright disabling them - we need to clean up all map patches at some point. 
By: md_5 <md_5@live.com.au>
 2013-03-23 19:32:46 +11:00
Spigot c6c8ed2b6d Remove extra import. 
By: md_5 <md_5@live.com.au>
 2013-03-23 19:09:47 +11:00
Spigot 271caf9719 Limit Custom Map Rendering 
The default CraftBukkit render sequence for maps is ridiculously slow. By only using it when a custom renderer has been added (rarely in most cases), we can fallback to the Vanilla renderer for general usage. This leads to a much higher effiency overall, especially if no plugins are rendering such maps.

By: md_5 <md_5@live.com.au>
 2013-03-23 19:08:49 +11:00
Spigot df6fa740d6 Additions to the async operation catching patch. 
By: md_5 <md_5@live.com.au>
 2013-03-23 18:27:02 +11:00
Spigot 15d914dbf0 Move async checks to their own patch so we can add more of them. 
By: md_5 <md_5@live.com.au>
 2013-03-23 18:05:22 +11:00
Spigot 8955b40968 Bump thread safety patch up. 
By: md_5 <md_5@live.com.au>
 2013-03-23 17:56:28 +11:00
Spigot 8129ed16ee CraftBukkit has added this patch, so we can remove it. 
By: md_5 <md_5@live.com.au>
 2013-03-23 15:41:55 +11:00