Commit graph

1000 commits

Author SHA1 Message Date
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
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
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
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
ddfda2753f Mob spawning issues - 'fix'. See below for ideal reasoning from MikePrimm, however until ideal reasoning we must live with the CraftBukkit / Vanilla behaviour since this causes far too many issues.
IIRC, the main item I was driving towards was a consequence of persistent passive mobs - specifically, the fact that allowing a population limit of N (independent of view distance, which is what vanilla does) when your view distance limits actual loaded chunks to a much smaller area than default (say a view of 4, which would be 9 x 9 chunks loaded per player - and spawnable - versus default, which is 8 radius spawn, or 17 x 17 chunks) tends to result in more mobs per chunk. For persistent mobs, this is bad - since they count for server load and for population just by being loaded, versus being despawned beyond 128 blocks (8 chunk radius - unconditional of view distance, as well) - so they can cause the population limit to be reached more easily, cutting off spawning nearer to players. The goal was to make it so that the mobs-per-loaded-chunk was about the same for all view distances, versus having low view distances cause higher mob concentrations.

    Now, all of this assumes that loaded chunks beyond those around players are modest (since they could contain passive mobs that would count towards the limits) - which they should be, except that recent CBs leak chunks like mad, from what I can see (chunk-gc has become more required than optional), and I think there may be some issues with even hostile mobs "lurking" around - possibly even after their chunks are unloaded. Anything that causes more mobs to be in places players don't see them is going to drive population limit issues, and resulting low spawn behaviors. The trick for us, trying to make big servers as practical as possible, is to shift the math the other way - given low view distances, how to best make sure that folks get reasonable spawn behavior while minimizing the time/resources spent on the server on mobs that don't help that. Realistically, I think we need to analyse the mob demographics better - especially as it relates to lower view distances (our changes have no net impact on view distances above 7) - particularly to understand how the proportion of "useful" mobs is working out (ones close enough to players to be considered contributing to game play). One thought is to manage the population limit based on mobs that are 'tickable' - if they aren't close enough to be ticking, they aren't interesting. This is likely a big issue for view distance 5 folks, since mobs cannot spawn closer than 24 (approx 1 chunk radius, given that middle chunk is 0), and don't tick when any of the chunks within a 2 chunk radius aren't loaded) - so, effectively, they "live" within a zone of 7 x 7 with the middle 3 x 3 removed (so, about 40 chunks) out of a total load zone of 11 x 11 (121) - so about 2/3 of the area containing mobs has idle mobs. Normal view distance would result in mobs ticking as far out as they can spawn (radius 8 versus a load radius of 11), so 100% of the mobs that spawn are ticking when they spawn, and all hostile mobs that are loaded are ticking (since they always despawn beyond 128 blocks / 8 chunks from a player). One interesting thought would be to limit the chunks we spawn mobs in to those where they would be ticking initially (that is, view-distance minus 2 or 3).

By: md_5 <md_5@live.com.au>
2013-01-29 16:54:36 +11:00
Spigot
455deb1188 10 years later...
By: md_5 <md_5@live.com.au>
2013-01-28 09:46:19 +11:00
Spigot
2091687de2 Fix tripwires + minecarts
By: md_5 <md_5@live.com.au>
2013-01-26 08:33:09 +11:00
Spigot
c47a51b285 Fix exp merging, oops
By: md_5 <md_5@live.com.au>
2013-01-25 18:25:18 +11:00
Spigot
37daa41841 Update patch fluff + only record sync times.
By: md_5 <md_5@live.com.au>
2013-01-25 14:00:07 +11:00
Spigot
e9144dac9b Add anti xray timings.
By: md_5 <md_5@live.com.au>
2013-01-25 13:27:22 +11:00
Spigot
27ddad7313 Handle patches merged to craftbukkit
By: md_5 <md_5@live.com.au>
2013-01-24 21:09:10 +11:00
Spigot
c1aa17a5ad Fix AIOOBE
By: md_5 <md_5@live.com.au>
2013-01-24 19:28:22 +11:00
Spigot
4cdcb01f9a Quick fix for oreobf crash, @lishid
By: md_5 <md_5@live.com.au>
2013-01-24 09:13:53 +11:00
Spigot
825efdfc3b Fix lightning - use vanilla lightning code.
By: md_5 <md_5@live.com.au>
2013-01-22 15:58:34 +11:00
Spigot
8d43341f1a Disable the ability to disable chunk-gc
By: Aikar <aikar@aikar.co>
2013-01-21 22:53:50 -05:00
Spigot
a0b9a93d01 Move Spigot config initialization code into its own class, and use it for /reload.
By: Aikar <aikar@aikar.co>
2013-01-21 21:46:53 -05:00
Spigot
e5983b9629 Reduce number of collision checks for living entities.
By: md_5 <md_5@live.com.au>
2013-01-22 10:04:57 +11:00
Spigot
33ded5df93 Add @EddGruberman's patch to fix nether portals when the nether is disabled.
By: md_5 <md_5@live.com.au>
2013-01-22 09:58:57 +11:00
Spigot
59d1636638 Check if chunk is loading before obfuscating.
By: md_5 <md_5@live.com.au>
2013-01-22 09:57:22 +11:00
Spigot
d14bfbaa67 Notify all adjacent blocks, thanks Aikar
By: md_5 <md_5@live.com.au>
2013-01-21 17:51:34 +11:00
Spigot
fff6e2d3fd Fix obfuscator being a little too effective.
By: md_5 <md_5@live.com.au>
2013-01-21 17:38:13 +11:00
Spigot
e079f48e9f Add oreobfuscator by @lishid for Spigot. Please report bugs and use with caution until stability can be verified.
By: md_5 <md_5@live.com.au>
2013-01-21 17:00:31 +11:00
Spigot
b7e4671f7f Better item merging
By: md_5 <md_5@live.com.au>
2013-01-21 14:32:12 +11:00
Spigot
353ba3e15b Fix conflicts to update to latest Bukkit, yay fluff.
By: md_5 <md_5@live.com.au>
2013-01-20 14:52:20 +11:00
Spigot
942a08c36a Add Aikar's timings patches.
By: md_5 <md_5@live.com.au>
2013-01-19 19:28:14 +11:00
Spigot
9ed1f633a0 Update patch fluff.
By: md_5 <md_5@live.com.au>
2013-01-19 19:22:25 +11:00
Spigot
1629453615 Sync free, but still safe reference cache for chunk loading.
By: md_5 <md_5@live.com.au>
2013-01-19 19:22:07 +11:00
Spigot
98a6d45daf Skip entity move if we aren't moving anywhere (aikar)
By: md_5 <md_5@live.com.au>
2013-01-19 19:20:35 +11:00
Spigot
d186cbe800 Add experimental patch to unload chunks more efficiently from the client by not grabbing them and compressing, instead just sending some predefined bytes
By: md_5 <md_5@live.com.au>
2013-01-18 22:27:42 +11:00
Spigot
c083fc0b4c Phew. I think that is 1.4.7 done
By: md_5 <md_5@live.com.au>
2013-01-18 09:27:26 +11:00
Spigot
74606fcf1c Rebuild all patches for 1.4.7
By: md_5 <md_5@live.com.au>
2013-01-18 08:58:06 +11:00
Spigot
b2f83676cf Cant forget to fix mushroom growth
By: md_5 <md_5@live.com.au>
2013-01-17 16:25:19 +11:00
Spigot
bf0a2efa81 Fix blockstem growth
By: md_5 <md_5@live.com.au>
2013-01-17 10:14:27 +11:00
Spigot
574461c520 Re add chunk snc lock and update patch files.
By: md_5 <md_5@live.com.au>
2013-01-16 11:32:20 +11:00
Spigot
dd7cd24332 Fix wheat modifier potentially crashing
By: md_5 <md_5@live.com.au>
2013-01-16 11:09:27 +11:00
Spigot
e846f2fe27 Update versioning check to correctly resolve api ver.
By: md_5 <md_5@bigpond.com>
2013-01-15 15:06:20 +11:00
md_5
017a98eb68 Initial commit - hello future of Spigot! 2013-01-15 12:18:40 +11:00