Commit graph

7377 commits

Author SHA1 Message Date
Spigot
6d3ec813ed Pull CraftBukkit #1024 by @evilmidget38 - Correct the CB object used for Brewing Stands. Fixes BUKKIT-3357
By: md_5 <md_5@live.com.au>
2013-03-02 09:05:30 +11:00
Spigot
dbd65c5168 Merge pull request #20 from aikar/master
Sanity check for naughty plugins
By: md-5 <md_5@live.com.au>
2013-02-27 11:19:21 -08:00
Spigot
5bf4cae8ba Sanity check for naughty plugins
Naughty plugins like DisguiseCraft hook into NMS and create entities with a null world.
So ensuring world is set or else defaulting to false

By: Aikar <aikar@aikar.co>
2013-02-27 10:10:07 -05:00
Spigot
dfe217aca6 Optimize checkIfActive to only check if chunks are loaded if entity is active
This will cut down on the call to areChunksLoaded drastically, which is pretty slow

By: Aikar <aikar@aikar.co>
2013-02-27 02:27:14 -05:00
Spigot
2c8cc83ee8 *crosses fingers for sneaky web edit
By: md-5 <md_5@live.com.au>
2013-02-27 17:14:37 +11:00
Spigot
78edae0084 Bump netty version. Why they so no pull my PR yet?
By: md_5 <md_5@live.com.au>
2013-02-27 16:51:57 +11:00
Spigot
fb5f7ea45a Netty has to be done with -D options to the JVM. Sorry!
By: md_5 <md_5@live.com.au>
2013-02-27 16:48:20 +11:00
Spigot
129f77dc51 Do not include task id in timings handler name
Plugins that spam use repeating task timers are filling up the CustomTimingHandler list, which can degrade performance over time
Considering Essentials does this, and many servers use Essentials... def need to stop this.

By: Aikar <aikar@aikar.co>
2013-02-27 00:39:53 -05:00
Spigot
fd69c72b22 Increase default watchdog time
By: md_5 <md_5@live.com.au>
2013-02-27 12:04:04 +11:00
Spigot
3be016271f Overhaul to Timings and Entity Activation Range
This greatly extends the timings improvements I've done in recent commits, and brings timings to fully cover the entire tick.
The timings system also now tracks when specific timings causes the server to lose TPS.
The timings are also able to be turned on "on demand", meaning you do not need to restart the server to enable them.

This commit also overhauls the Entity Activation Range feature, fixing bugs, adding more immunities, and improving the performance of it.
It also fixes a regression with a recent Spigot commit that broke the entire Entity Activation Range feature.

This commit had to move the Tick Loop patch before timings because there was a change done there to time the entire tick, so lots of renames.

These 2 commits had to be bundled together to simplify applying them and reduce redundant conflict resolution.

By: Aikar <aikar@aikar.co>
2013-02-26 12:21:40 -05:00
Spigot
7c1adc0df4 Fix ores from bouncing off walls
By: SuPaH sPii <r29jk10@gmail.com>
2013-02-26 11:43:00 +11:00
Spigot
15d29c806a Allow small view distances.
By: md_5 <md_5@live.com.au>
2013-02-26 11:31:37 +11:00
Spigot
dbfd5fc5b0 Add missing config options.
By: md_5 <md_5@live.com.au>
2013-02-26 11:19:08 +11:00
Spigot
c3f23f2bef Add PR #7 - improve ping sending.
By: md_5 <md_5@live.com.au>
2013-02-24 20:43:10 +11:00
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