SteamWar/Paper
12
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
163 Commits 3 Branches 0 Tags
dc2708293f6dbe5a46e5b01028f4e70b6fad34b4
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Spigot dc2708293f Pull CraftBukkit PR 1021 - Prevent exploitation of custom plugin channels 
By: md_5 <md_5@live.com.au>
 2013-02-24 17:28:42 +11:00
Spigot 19823834ea Fix metrics, I hope. 
By: md_5 <md_5@live.com.au>
 2013-02-24 13:51:58 +11:00
Spigot 006da500e9 Try new way of handling maps in frames 
By: Aikar <aikar@aikar.co>
 2013-02-24 13:37:20 +11:00
Spigot 3c7dbb66cd Use native Java ciphers in favour of BouncyCastle. Cookie to whoever can try and use the native byte buffer backing the Netty buffers for encryption / decryption. 
By: md_5 <md_5@live.com.au>
 2013-02-24 12:38:41 +11:00
Spigot 567a45621c Fix NPE on start 
By: md_5 <md_5@live.com.au>
 2013-02-24 12:19:34 +11:00
Spigot 54b9e5d4f8 Tweaks + extra config concerning the network subsystem 
By: md_5 <md_5@live.com.au>
 2013-02-24 12:01:33 +11:00
Spigot 1367d5dc69 Pop Netty patch to the top. 
By: md_5 <md_5@live.com.au>
 2013-02-24 11:31:54 +11:00
Spigot fd322f7c1b Make restart more reliable 
By: Keir Nellyer <keir@nellyer.co.uk>
 2013-02-24 11:30:30 +11:00
Spigot 5f0ca4e289 [[Experimental]] Rewrite Watchdog thread / crash detector. 
By: md_5 <md_5@live.com.au>
 2013-02-23 12:37:58 +11:00
Spigot 013c121a6f Prepare for restart / crash detection rewrite. 
By: md_5 <md_5@live.com.au>
 2013-02-23 11:50:29 +11:00
Spigot 9ea13b3dfe Automatically update upstream versions. Bukkit-1.4.7-R1.0-3-g0b494f8, CraftBukkit-1.4.7-R1.0-9-g65324d6 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-02-22 22:56:37 -06:00
Spigot 2e26d4a2bf Start metrics only once 
By: md_5 <md_5@live.com.au>
 2013-02-23 09:59:26 +11:00
Spigot 2ea50aa0fc Add aikar.co url too 
By: md_5 <md_5@live.com.au>
 2013-02-23 09:52:23 +11:00
Spigot 7b6de25299 Add paste flag to timings. 
By: md_5 <md_5@live.com.au>
 2013-02-23 09:33:01 +11:00
Spigot bcb0ea56d4 Rerwrite the metrics code to be closer to the Bukkit version. 
By: md_5 <md_5@live.com.au>
 2013-02-23 08:58:55 +11:00
Spigot 1682097f81 Remove TagAPI patches. 
By: md_5 <md_5@live.com.au>
 2013-02-22 19:30:23 +11:00
Spigot 22048bfe81 Add highPriorityQueue 
By: md_5 <md_5@live.com.au>
 2013-02-22 19:29:36 +11:00
Spigot 14a8719dad Allow provisionally disabling chunk GC 
By: md_5 <md_5@live.com.au>
 2013-02-22 19:11:59 +11:00
Spigot 67374a6263 Improved tile entity lookup for chunk sending 
We already have direct access to the chunks tile entities, there is no reason to look them up again.

By: shakytom <tom.roberts00@gmail.com>
 2013-02-20 23:16:49 -05:00
Spigot c3fc9635b8 Optimize getTileEntities 
Avoid traversing tile entities for every loaded chunk

By: Mike Primm <mike@primmhome.com>
 2013-02-21 00:40:28 -06:00
Spigot 56f1d1c01d TagAPI won't load anyway - no need to manually disable it. 
By: md_5 <md_5@live.com.au>
 2013-02-20 20:20:27 +11:00
Spigot 63b5fdba98 TagAPI is installed, I swear. 
By: md_5 <md_5@live.com.au>
 2013-02-20 20:16:54 +11:00
Spigot ce038722f8 Implement the rest of TagAPI 
By: md_5 <md_5@live.com.au>
 2013-02-20 19:08:43 +11:00
Spigot ba3f658dfd Fix falling sand entities with orebfuscator. 
By: SuPaH sPii <r29jk10@gmail.com>
 2013-02-19 18:58:31 -06:00
Spigot 23fc65c6fd This is what I call the balancing game - use 2 NIO threads 
By: md_5 <md_5@live.com.au>
 2013-02-20 07:34:18 +11:00
Spigot 587fe30827 Remove extra chunkGC call left over after CraftBukkit merge 
By: Aikar <aikar@aikar.co>
 2013-02-19 15:10:01 -05:00
Spigot 061fdf3d06 Fix logic error with living entity collision reduction. 
The previous version missed the entire point of the change and made it only skip collision on NON living entities... which is not often at all.

It was meant to only Skip Living->Living, or else we won't get any gain...

By: Aikar <aikar@aikar.co>
 2013-02-19 11:43:00 -05:00
Spigot 65d005a475 Name that thread too 
By: md_5 <md_5@live.com.au>
 2013-02-19 20:30:26 +11:00
Spigot 71175ecaa8 Dont disable tagAPI for now 
By: md_5 <md_5@live.com.au>
 2013-02-19 20:28:30 +11:00
Spigot ba015768c7 Few fixes, tweaks for Netty 
By: md_5 <md_5@live.com.au>
 2013-02-19 19:38:18 +11:00
Spigot b32484c70f Implement TagAPI into Spigot - much more efficient and only a dozen lines of code. 
By: md_5 <md_5@live.com.au>
 2013-02-19 18:30:34 +11:00
Spigot 5451e30739 Change field name for backwards support 
By: md_5 <md_5@live.com.au>
 2013-02-19 18:01:42 +11:00
Spigot 1c86622253 Oops 
By: md_5 <md_5@live.com.au>
 2013-02-18 18:30:25 +11:00
Spigot 2f74e8d74d Bit nicer for TagAPI 
By: md_5 <md_5@live.com.au>
 2013-02-18 17:46:31 +11:00
Spigot 75510381f7 Move protocol lib threads around - and reduce netty threads a lot. 
By: md_5 <md_5@live.com.au>
 2013-02-17 20:47:27 +11:00
Spigot fd8ab30ef6 Update to actually compile with netty beta 
By: md_5 <md_5@live.com.au>
 2013-02-17 20:15:48 +11:00
Spigot aaf58e51fe Use correct depend 
By: md_5 <md_5@live.com.au>
 2013-02-17 20:10:50 +11:00
Spigot 00a55293f5 Use release Netty to avoid performance regressions. 
By: md_5 <md_5@live.com.au>
 2013-02-17 20:06:57 +11:00
Spigot ffd8c932ba Handle vanished players in tab list 
By: md_5 <md_5@live.com.au>
 2013-02-17 17:31:52 +11:00
Spigot 59f79fb46a Use more threads for netty to help with lag. 
By: md_5 <md_5@live.com.au>
 2013-02-17 16:35:11 +11:00
Spigot 594eb1651c Use tab list name to prevent duplicates. 
By: md_5 <md_5@live.com.au>
 2013-02-16 19:46:56 +11:00
Spigot bca3cabb22 Keep a definsive copy of players for entity activation 
By: md_5 <md_5@live.com.au>
 2013-02-16 19:46:08 +11:00
Spigot 7da770870f Use vanilla method - just with toggle 
By: md_5 <md_5@live.com.au>
 2013-02-16 19:05:26 +11:00
Spigot c363ace8a7 Allow to occasionally send tab list updates 
By: md_5 <md_5@live.com.au>
 2013-02-16 17:56:39 +11:00
Spigot d815af0ec3 Use a compression level of 4 for chunk packets 
By: md_5 <md_5@live.com.au>
 2013-02-16 13:33:46 +11:00
Spigot 8fd703d6bb And chests... 
By: md_5 <md_5@live.com.au>
 2013-02-16 10:24:25 +11:00
Spigot c69472dab1 Don't use ender chests or stone as hiding materials 
By: md_5 <md_5@live.com.au>
 2013-02-16 10:19:31 +11:00
Spigot 7d84569b06 Add engine mode 2 
By: SuPaH sPii <r29jk10@gmail.com>
 2013-02-16 10:13:00 +11:00
Spigot dd60921594 Make map send speed configurable. 
By: md_5 <md_5@live.com.au>
 2013-02-15 18:34:42 +11:00
Spigot 25a0b1356d Please don't spam console every ping. 
By: md_5 <md_5@live.com.au>
 2013-02-15 18:25:53 +11:00
Spigot 00275b6d81 Remove extra disconnect info - confuses people into thinking something is wrong 
By: md_5 <md_5@live.com.au>
 2013-02-14 17:33:09 +11:00
Spigot 4937d401df Remove locking in favour of a volatile state variable. 
By: md_5 <md_5@live.com.au>
 2013-02-13 12:22:25 +11:00
Spigot 2b28813233 Break packet reading into states to reduce object churn. 
By: md_5 <md_5@live.com.au>
 2013-02-13 12:11:37 +11:00
Spigot c6a2240466 Reorder check for isEmpty, on a ConcurrentLinkedQueue its 
more expensive than would appear.

By: md_5 <md_5@live.com.au>
 2013-02-12 16:29:15 +11:00
Spigot 4546d28bde Switch back to unbounded queue. 
By: md_5 <md_5@live.com.au>
 2013-02-12 16:23:43 +11:00
Spigot f4badf2f0d Fix orebfuscator enabled log message 
By: Agaricus <agaricusb@yahoo.com>
 2013-02-10 20:04:32 -08:00
Spigot 9506e32ba0 Apply entity activation range, the most over hyped commit ever. 
By: md_5 <md_5@live.com.au>
 2013-02-11 19:32:14 +11:00
Spigot 5f1cd7b41a Automatically update upstream versions. Bukkit-1.4.7-R1.0-2-g23f5a05, CraftBukkit-1.4.7-R1.0-9-g65324d6 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-02-10 17:41:21 -06:00
Spigot bf3fab5c13 Add proper thread safety. Please let me know if this deadlocks your server. 
By: md_5 <md_5@live.com.au>
 2013-02-10 18:35:09 +11:00
Spigot 3e9cf48079 If you are a server list owner, and you have not fixed your shit, I kindly request that you do so NOW. I will not waste another 5 hours of my life covering up for you. 4 months is more than long enough for 3 lines of code change. 
By: md_5 <md_5@live.com.au>
 2013-02-10 16:50:54 +11:00
Spigot 52fc2b1ea2 Add volatile to be sure the JVM wont cache the value 
By: md_5 <md_5@live.com.au>
 2013-02-10 15:12:35 +11:00
Spigot ffe44eefa2 Fix occasionally showing as 1.3 
By: md_5 <md_5@live.com.au>
 2013-02-10 15:04:27 +11:00
Spigot 1ccfa93293 Revert "Reduce legacy ping threshold to 1000ms" 
This reverts commit eb53806048.

By: md_5 <md_5@live.com.au>
 2013-02-10 14:52:14 +11:00
Spigot eb53806048 Reduce legacy ping threshold to 1000ms 
By: md_5 <md_5@live.com.au>
 2013-02-10 14:35:13 +11:00
Spigot 07ebde686f Fix legacy pinging with some uber ninja coding. 
By: md_5 <md_5@live.com.au>
 2013-02-10 14:26:59 +11:00
Spigot 3b1b3a1a6a Fix support for windows xp / server 2003 
By: md_5 <md_5@live.com.au>
 2013-02-10 12:35:52 +11:00
Spigot 4a2b769924 It came to me in a dream - literally. This should fix all known issues. 
By: md_5 <md_5@live.com.au>
 2013-02-10 11:54:49 +11:00
Spigot 0470d35982 Tweak to thread pool and safety. 
By: md_5 <md_5@live.com.au>
 2013-02-10 10:30:58 +11:00
Spigot 913785e91c Clearing the queue when they are disconnected might actually fix some issues. 
By: md_5 <md_5@live.com.au>
 2013-02-10 09:33:31 +11:00
Spigot 93e8ed2af2 Add extra info regarding why a user is disconnected. Should help us troubleshoot these errors - please post the full DC line if reporting a bug. 
By: md_5 <md_5@live.com.au>
 2013-02-10 08:55:18 +11:00
Spigot b91a5519b8 *break when dc'd 
By: md_5 <md_5@live.com.au>
 2013-02-09 23:00:03 +11:00
Spigot beb405de3d Remove debug code now that we know it can be called. 
By: md_5 <md_5@live.com.au>
 2013-02-09 22:54:14 +11:00
Spigot b86ff9221a Run disconnect code on the main thread. 
By: md_5 <md_5@live.com.au>
 2013-02-09 21:55:33 +11:00
Spigot cacf82702a Add debug to see if statement is ever true 
By: md_5 <md_5@live.com.au>
 2013-02-09 21:28:34 +11:00
Spigot cf017832f9 Give a pot shot at bringing network logic a bit closer to CB/Vanilla 
By: md_5 <md_5@live.com.au>
 2013-02-09 21:05:34 +11:00
Spigot 0dd1a832f2 Small cleanup to netty code, no functional changes. 
By: md_5 <md_5@live.com.au>
 2013-02-09 20:58:03 +11:00
Spigot 27b63340b1 Don't scare users with debug mode. 
By: md_5 <md_5@live.com.au>
 2013-02-09 20:42:08 +11:00
Spigot e274cc30a0 Add debug logging + more cleanup 
By: md_5 <md_5@live.com.au>
 2013-02-09 20:27:25 +11:00
Spigot 4d4b061767 Nullcheck channel just in case, only null channel on disconnect. 
By: md_5 <md_5@live.com.au>
 2013-02-09 20:16:23 +11:00
Spigot b0cc5c98b9 Use a synced arraylist 
By: md_5 <md_5@live.com.au>
 2013-02-09 20:10:34 +11:00
Spigot 01590fb1fa Implement an uber efficient network engine based on the Java NIO framework Netty. This is basically a complete rewrite of the Minecraft network engine with many distinct advantages. First and foremost, there will no longer be the horrid, and redundant case of 2, or even at times, 3 threads per a connection. Instead low level select/epoll based NIO is used. The number of threads used for network reading and writing will scale automatically to the number of cores for use on your server. In most cases this will be around 8 threads for a 4 core server, much better than the up to 1000 threads that could be in use at one time with the old engine. To facilitate asynchronous packet sending or receiving (currently only chat), a cached thread pool is kept handy. Currently this pool is unbounded, however at this stage we do not need to worry about servers being resource starved due to excessive spam or chat. 
== Plugin incompatibilities
As a side effect of this change, plugins which rely on very specific implementation level details within Minecraft are broken. At this point in time, TagAPI and ProtocolLib are affected. If you are a user of ProtocolLib you are advised to update to the latest build, where full support is enabled. If you are a user of TagAPI, support has not yet been added, so you will need to install the updated ProtocolLib so that TagAPI may use its functions.
== Stability
The code within this commit has been very lightly tested in production (300 players for approximately 24 hours), however it is not guaranteed to be free from all bugs. If you experence weird connection behaviour, reporting the bug and steps to reproduce are advised. You are also free to downgrade to the latest recommend build, which is guaranteed to be stable.
== Summary
This commit provides a reduction in threads, which gives the CPU / operating system more time to allocate to the main server threads, as well as various other side benefits such as chat thread pooling and a slight reduction in latency.
This commit is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported license.

By: md_5 <md_5@live.com.au>
 2013-02-09 17:16:27 +11:00
Spigot a5f0015001 Split TPS patch out correctly. 
By: md_5 <md_5@live.com.au>
 2013-02-08 17:09:51 +11:00
Spigot 9aca2747b3 Please people, report to Spigot, not me 
By: md_5 <md_5@live.com.au>
 2013-02-07 20:23:31 +11:00
Spigot 90e4d640aa Send maps even less often, still causing lag. Appreciate if anyone can PR a config option for this, bit busy atm. 
By: md_5 <md_5@live.com.au>
 2013-02-06 21:08:37 +11:00
Spigot e511853fa1 Automatically update upstream versions. Bukkit-1.4.7-R1.0-2-g23f5a05, CraftBukkit-1.4.7-R1.0-5-g6c77179 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-02-04 18:56:19 -06:00
Spigot 29c92ae96d Automatically update upstream versions. Bukkit-1.4.7-R1.0-2-g23f5a05, CraftBukkit-1.4.7-R1.0-1-gf6e394d 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-02-03 04:11:52 -06:00
Spigot 3018ca404d Move tick loop changes to own patch with a few optimizations. 
By: md_5 <md_5@live.com.au>
 2013-02-03 12:28:39 +11:00
Spigot f4ea7c10b0 Actually use the parent pom. 
By: md_5 <md_5@live.com.au>
 2013-02-03 09:54:16 +11:00
Spigot a6f60283d4 Just use the parent pom. 
By: md_5 <md_5@live.com.au>
 2013-02-03 09:48:23 +11:00
Spigot 4911597232 Update POM changes to individual patches. 
By: md_5 <md_5@live.com.au>
 2013-02-03 09:38:54 +11:00
Spigot d15d2abde8 Detect, remove and warn about null tile entities. This prevents odd server crashes, caused by unknown reasons. 
By: md_5 <md_5@live.com.au>
 2013-02-03 09:21:35 +11:00
Spigot b5cbe0fab3 Send maps, just a lot less often. 
By: md_5 <md_5@live.com.au>
 2013-02-02 19:41:11 +11:00
Spigot f8fbf3d5f2 Only nag if we are finding for the first time.. 
By: md_5 <md_5@live.com.au>
 2013-02-02 18:11:59 +11:00
Spigot 4988523089 Abuse plugins which embed metrics in the default location. 
By: md_5 <md_5@live.com.au>
 2013-02-02 16:41:52 +11:00
Spigot 79c9fcda86 Plugins break when the intended behaviour is put into place, because for some reason they are all packaging the same classes, an inherently unsafe operation in the case that the classes are loaded at the same time by multiple classloaders - hence we are removing safety from the loaders for now until a correct solution can be put in place. 
By: md_5 <md_5@live.com.au>
 2013-02-02 16:30:39 +11:00
Spigot cdb471a4bf Another attempt at 'fixing' the mob spawn issues present in CraftBukkit. 
By: md_5 <md_5@live.com.au>
 2013-02-02 09:02:14 +11:00
Spigot 1d7d6dcc9f Update to CraftBukkit 1.4.7-R1 
By: md_5 <md_5@live.com.au>
 2013-01-31 16:56:47 +11:00
Spigot 00600fc9e0 Automatically update upstream versions. Bukkit-1.4.7-R1.0-1-gf598dac, CraftBukkit-1.4.7-R1.0-1-gf6e394d 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-01-30 22:51:16 -06:00
Spigot 4101e6f647 Automatically update upstream versions. Bukkit-1.4.7-R1.0, CraftBukkit-1.4.7-R1.0 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-01-30 22:41:17 -06:00
Spigot 8156457682 Automatically update upstream versions. Bukkit-1.4.7-R0.1-6-g3fc631f, CraftBukkit-1.4.7-R0.1-26-gabccf54 
By: EcoCityCraft <admin@ecocitycraft.com>
 2013-01-30 00:21:30 -06:00