Commit Graph

4548 Commits

Author SHA1 Message Date
68f9541e46 Revert "Use blazingly fast encryption."
This reverts commit 3309234e39.

By: md_5 <md_5@live.com.au>
2013-03-11 18:45:25 +11:00
3309234e39 Use blazingly fast encryption.
By: md_5 <md_5@live.com.au>
2013-03-11 09:53:34 +11:00
02150db731 Thread safety.
Adds thread safety for chunk load / unload methods.

By: md_5 <md_5@live.com.au>
2013-03-07 20:12:53 +11:00
89f57511ac Rename generated repo, and only deploy API, not server.
By: md_5 <md_5@live.com.au>
2013-03-07 17:45:12 +11:00
e514a12e83 Quick fix damage event
By: md-5 <md_5@live.com.au>
2013-03-05 07:22:03 +11:00
cbbd6b577d Implement PlayerItemDamageEvent. @Sleaker @Kainzo - if you could kindly tell me why you add code to prevent Heroes from running on a **now supported** platform, I would love to know, maybe we can resolve this once and for all. Unless of course it is simply part of your plan to make people use your rise against CraftBukkit fork with only 1 tiny feature which can and will be replicated in a plugin if need be.
By: md_5 <md_5@live.com.au>
2013-03-04 18:49:59 +11:00
ce69ac9dbe Fix errors in command block commands crashing the server.
By: md_5 <md_5@live.com.au>
2013-03-03 20:23:04 +11:00
35e8706397 CB has now merged the commits we pulled, so they can be removed.
By: md_5 <md_5@live.com.au>
2013-03-03 09:37:31 +11:00
7b105cefda Automatically update upstream versions. Bukkit-1.4.7-R1.0-4-gaa7469c, CraftBukkit-1.4.7-R1.0-13-g437c575
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-02 16:36:53 -06:00
ae6874b283 Automatically update upstream versions. Bukkit-1.4.7-R1.0-4-gaa7469c, CraftBukkit-1.4.7-R1.0-12-g0ebed52
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-02 16:27:01 -06:00
f52ed81d18 Automatically update upstream versions. Bukkit-1.4.7-R1.0-4-gaa7469c, CraftBukkit-1.4.7-R1.0-10-g1ba48e7
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-02 00:36:58 -06:00
0f2cfe0303 Fix snapshot support.
By: md_5 <md_5@live.com.au>
2013-03-02 17:27:44 +11:00
4013812866 Add configurable 13w09c protocol support.
By: md_5 <md_5@live.com.au>
2013-03-02 13:34:52 +11:00
23ef44c195 Rename connection timing to accurately reflect what is actually being timed.
By: md_5 <md_5@live.com.au>
2013-03-02 10:40:13 +11:00
533f36d39b Pull CraftBukkit #1007 from @jrtc27 - console formatting now replicates Minecraft properly.
By: md_5 <md_5@live.com.au>
2013-03-02 10:07:29 +11:00
00c98bb061 Pull CraftBukkit #1043 by @YLivay - addresses incorrect info returned to plugins in the dispense event.
By: md_5 <md_5@live.com.au>
2013-03-02 09:47:17 +11:00
4812d94ad9 Pull CraftBukkit #1042 by @YLivay - addresses players glitching when the sleep whilst being marked as faux sleepers.
By: md_5 <md_5@live.com.au>
2013-03-02 09:43:59 +11:00
abb5a8c429 Pull CraftBukkit #1041 by @YLivay - address missing event for paintings breaking due to movement.
By: md_5 <md_5@live.com.au>
2013-03-02 09:38:27 +11:00
93b6957b56 Pull CraftBukkit PR #1037 by @EdGruberman - fixes issues with plugins and items dropped by clicking outside an inventory.
By: md_5 <md_5@live.com.au>
2013-03-02 09:25:48 +11:00
166d4a8990 Pull CraftBukkit #1028 by @EdGruberman to address a few issues with plugins and beds.
By: md_5 <md_5@live.com.au>
2013-03-02 09:17:52 +11:00
c7f16ebbea When I add code to prevent server crashes, I expect it to stay there.
By: md_5 <md_5@live.com.au>
2013-03-02 09:09:10 +11:00
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
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
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
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
2c8cc83ee8 *crosses fingers for sneaky web edit
By: md-5 <md_5@live.com.au>
2013-02-27 17:14:37 +11:00
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
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
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
fd69c72b22 Increase default watchdog time
By: md_5 <md_5@live.com.au>
2013-02-27 12:04:04 +11:00
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
7c1adc0df4 Fix ores from bouncing off walls
By: SuPaH sPii <r29jk10@gmail.com>
2013-02-26 11:43:00 +11:00
15d29c806a Allow small view distances.
By: md_5 <md_5@live.com.au>
2013-02-26 11:31:37 +11:00
dbfd5fc5b0 Add missing config options.
By: md_5 <md_5@live.com.au>
2013-02-26 11:19:08 +11:00
c3f23f2bef Add PR #7 - improve ping sending.
By: md_5 <md_5@live.com.au>
2013-02-24 20:43:10 +11:00
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
19823834ea Fix metrics, I hope.
By: md_5 <md_5@live.com.au>
2013-02-24 13:51:58 +11:00
006da500e9 Try new way of handling maps in frames
By: Aikar <aikar@aikar.co>
2013-02-24 13:37:20 +11:00
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
567a45621c Fix NPE on start
By: md_5 <md_5@live.com.au>
2013-02-24 12:19:34 +11:00
54b9e5d4f8 Tweaks + extra config concerning the network subsystem
By: md_5 <md_5@live.com.au>
2013-02-24 12:01:33 +11:00
1367d5dc69 Pop Netty patch to the top.
By: md_5 <md_5@live.com.au>
2013-02-24 11:31:54 +11:00
fd322f7c1b Make restart more reliable
By: Keir Nellyer <keir@nellyer.co.uk>
2013-02-24 11:30:30 +11:00
5f0ca4e289 [[Experimental]] Rewrite Watchdog thread / crash detector.
By: md_5 <md_5@live.com.au>
2013-02-23 12:37:58 +11:00
013c121a6f Prepare for restart / crash detection rewrite.
By: md_5 <md_5@live.com.au>
2013-02-23 11:50:29 +11:00
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
2e26d4a2bf Start metrics only once
By: md_5 <md_5@live.com.au>
2013-02-23 09:59:26 +11:00
2ea50aa0fc Add aikar.co url too
By: md_5 <md_5@live.com.au>
2013-02-23 09:52:23 +11:00
7b6de25299 Add paste flag to timings.
By: md_5 <md_5@live.com.au>
2013-02-23 09:33:01 +11:00
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