md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								825ae6c6ba 
								
							 
						 
						
							
							
								
								Fix patch name.  
							
							 
							
							
							
						 
						
							2013-03-11 20:08:41 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								72123ab9a3 
								
							 
						 
						
							
							
								
								Update snapshot version.  
							
							 
							
							
							
						 
						
							2013-03-11 19:14:10 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								c8b552e908 
								
							 
						 
						
							
							
								
								Revert "Use blazingly fast encryption."  
							
							 
							
							... 
							
							
							
							This reverts commit 3d85d6b42f . 
							
						 
						
							2013-03-11 18:45:25 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								3d85d6b42f 
								
							 
						 
						
							
							
								
								Use blazingly fast encryption.  
							
							 
							
							
							
						 
						
							2013-03-11 09:53:34 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								9c18df62b7 
								
							 
						 
						
							
							
								
								Thread safety.  
							
							 
							
							... 
							
							
							
							Adds thread safety for chunk load / unload methods. 
							
						 
						
							2013-03-07 20:12:53 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								3c54fa95be 
								
							 
						 
						
							
							
								
								Rename generated repo, and only deploy API, not server.  
							
							 
							
							
							
						 
						
							2013-03-07 17:49:54 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md-5 
								
							 
						 
						
							
							
							
							
								
							
							
								6a61d27c10 
								
							 
						 
						
							
							
								
								Quick fix damage event  
							
							 
							
							
							
						 
						
							2013-03-05 07:22:03 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								2faef00909 
								
							 
						 
						
							
							
								
								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.  
							
							 
							
							
							
						 
						
							2013-03-04 18:49:59 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								c1b617ddc8 
								
							 
						 
						
							
							
								
								Fix errors in command block commands crashing the server.  
							
							 
							
							
							
						 
						
							2013-03-03 20:23:04 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								0edbf1f0d8 
								
							 
						 
						
							
							
								
								CB has now merged the commits we pulled, so they can be removed.  
							
							 
							
							
							
						 
						
							2013-03-03 09:38:38 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									EcoCityCraft 
								
							 
						 
						
							
							
							
							
								
							
							
								bfd6535946 
								
							 
						 
						
							
							
								
								Automatically update upstream versions. Bukkit-1.4.7-R1.0-4-gaa7469c, CraftBukkit-1.4.7-R1.0-13-g437c575  
							
							 
							
							
							
						 
						
							2013-03-02 16:36:53 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									EcoCityCraft 
								
							 
						 
						
							
							
							
							
								
							
							
								0ad29c88c0 
								
							 
						 
						
							
							
								
								Automatically update upstream versions. Bukkit-1.4.7-R1.0-4-gaa7469c, CraftBukkit-1.4.7-R1.0-12-g0ebed52  
							
							 
							
							
							
						 
						
							2013-03-02 16:27:01 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									EcoCityCraft 
								
							 
						 
						
							
							
							
							
								
							
							
								f16a7d5522 
								
							 
						 
						
							
							
								
								Automatically update upstream versions. Bukkit-1.4.7-R1.0-4-gaa7469c, CraftBukkit-1.4.7-R1.0-10-g1ba48e7  
							
							 
							
							
							
						 
						
							2013-03-02 00:36:58 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								36cebc5b7c 
								
							 
						 
						
							
							
								
								Fix snapshot support.  
							
							 
							
							
							
						 
						
							2013-03-02 17:27:44 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								ef9bf59cb6 
								
							 
						 
						
							
							
								
								Add configurable 13w09c protocol support.  
							
							 
							
							
							
						 
						
							2013-03-02 13:34:52 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								6164c0bd18 
								
							 
						 
						
							
							
								
								Rename connection timing to accurately reflect what is actually being timed.  
							
							 
							
							
							
						 
						
							2013-03-02 10:40:13 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								3345b8b177 
								
							 
						 
						
							
							
								
								Pull CraftBukkit  #1007  from @jrtc27 - console formatting now replicates Minecraft properly.  
							
							 
							
							
							
						 
						
							2013-03-02 10:07:29 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								0920b554f4 
								
							 
						 
						
							
							
								
								Pull CraftBukkit  #1043  by @YLivay - addresses incorrect info returned to plugins in the dispense event.  
							
							 
							
							
							
						 
						
							2013-03-02 09:47:17 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								0c77bff298 
								
							 
						 
						
							
							
								
								Pull CraftBukkit  #1042  by @YLivay - addresses players glitching when the sleep whilst being marked as faux sleepers.  
							
							 
							
							
							
						 
						
							2013-03-02 09:43:59 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								08fef878fa 
								
							 
						 
						
							
							
								
								Pull CraftBukkit  #1041  by @YLivay - address missing event for paintings breaking due to movement.  
							
							 
							
							
							
						 
						
							2013-03-02 09:38:27 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								c454326dbf 
								
							 
						 
						
							
							
								
								Pull CraftBukkit PR  #1037  by @EdGruberman - fixes issues with plugins and items dropped by clicking outside an inventory.  
							
							 
							
							
							
						 
						
							2013-03-02 09:25:48 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								287b636b66 
								
							 
						 
						
							
							
								
								Pull CraftBukkit  #1028  by @EdGruberman to address a few issues with plugins and beds.  
							
							 
							
							
							
						 
						
							2013-03-02 09:17:52 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								1c84a5dd8c 
								
							 
						 
						
							
							
								
								When I add code to prevent server crashes, I expect it to stay there.  
							
							 
							
							
							
						 
						
							2013-03-02 09:09:10 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								e2ca1b4c97 
								
							 
						 
						
							
							
								
								Pull CraftBukkit  #1024  by @evilmidget38 - Correct the CB object used for Brewing Stands. Fixes BUKKIT-3357  
							
							 
							
							
							
						 
						
							2013-03-02 09:05:30 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md-5 
								
							 
						 
						
							
							
							
							
								
							
							
								d8782e2d04 
								
							 
						 
						
							
							
								
								Merge pull request  #20  from aikar/master  
							
							 
							
							... 
							
							
							
							Sanity check for naughty plugins 
							
						 
						
							2013-02-27 11:19:21 -08:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Aikar 
								
							 
						 
						
							
							
							
							
								
							
							
								4a97306f92 
								
							 
						 
						
							
							
								
								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 
							
						 
						
							2013-02-27 10:10:07 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Aikar 
								
							 
						 
						
							
							
							
							
								
							
							
								577140d9ab 
								
							 
						 
						
							
							
								
								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 
							
						 
						
							2013-02-27 19:10:22 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md-5 
								
							 
						 
						
							
							
							
							
								
							
							
								adc47e13e1 
								
							 
						 
						
							
							
								
								*crosses fingers for sneaky web edit  
							
							 
							
							
							
						 
						
							2013-02-27 17:14:37 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								d191b1171b 
								
							 
						 
						
							
							
								
								Bump netty version. Why they so no pull my PR yet?  
							
							 
							
							
							
						 
						
							2013-02-27 16:51:57 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								e8de702f14 
								
							 
						 
						
							
							
								
								Netty has to be done with -D options to the JVM. Sorry!  
							
							 
							
							
							
						 
						
							2013-02-27 16:48:20 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Aikar 
								
							 
						 
						
							
							
							
							
								
							
							
								b5230a3857 
								
							 
						 
						
							
							
								
								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. 
							
						 
						
							2013-02-27 16:43:21 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								44927fdaa6 
								
							 
						 
						
							
							
								
								Increase default watchdog time  
							
							 
							
							
							
						 
						
							2013-02-27 12:04:04 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Aikar 
								
							 
						 
						
							
							
							
							
								
							
							
								e9950b70d3 
								
							 
						 
						
							
							
								
								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. 
							
						 
						
							2013-02-27 07:29:33 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									SuPaH sPii 
								
							 
						 
						
							
							
							
							
								
							
							
								952580285d 
								
							 
						 
						
							
							
								
								Fix ores from bouncing off walls  
							
							 
							
							
							
						 
						
							2013-02-26 11:43:00 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								b5b668aae7 
								
							 
						 
						
							
							
								
								Allow small view distances.  
							
							 
							
							
							
						 
						
							2013-02-26 11:31:37 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								035204aad2 
								
							 
						 
						
							
							
								
								Add missing config options.  
							
							 
							
							
							
						 
						
							2013-02-26 11:19:08 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								d852f744a0 
								
							 
						 
						
							
							
								
								Add PR  #7  - improve ping sending.  
							
							 
							
							
							
						 
						
							2013-02-24 20:47:26 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								7bba9c7354 
								
							 
						 
						
							
							
								
								Pull CraftBukkit PR 1021 - Prevent exploitation of custom plugin channels  
							
							 
							
							
							
						 
						
							2013-02-24 17:28:42 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								a179158f34 
								
							 
						 
						
							
							
								
								Fix metrics, I hope.  
							
							 
							
							
							
						 
						
							2013-02-24 13:57:54 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Aikar 
								
							 
						 
						
							
							
							
							
								
							
							
								8237774639 
								
							 
						 
						
							
							
								
								Try new way of handling maps in frames  
							
							 
							
							
							
						 
						
							2013-02-24 13:37:20 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								1bd64e3e7a 
								
							 
						 
						
							
							
								
								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.  
							
							 
							
							
							
						 
						
							2013-02-24 12:38:41 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								d95c162605 
								
							 
						 
						
							
							
								
								Fix NPE on start  
							
							 
							
							
							
						 
						
							2013-02-24 12:19:34 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								7baf714b5d 
								
							 
						 
						
							
							
								
								Tweaks + extra config concerning the network subsystem  
							
							 
							
							
							
						 
						
							2013-02-24 12:01:33 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								0c82f07a42 
								
							 
						 
						
							
							
								
								Pop Netty patch to the top.  
							
							 
							
							
							
						 
						
							2013-02-24 11:31:54 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Keir Nellyer 
								
							 
						 
						
							
							
							
							
								
							
							
								9d8bd67e07 
								
							 
						 
						
							
							
								
								Make restart more reliable  
							
							 
							
							
							
						 
						
							2013-02-24 11:30:30 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								f7687b0c20 
								
							 
						 
						
							
							
								
								[[Experimental]] Rewrite Watchdog thread / crash detector.  
							
							 
							
							
							
						 
						
							2013-02-24 11:25:38 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								421ce6cf7d 
								
							 
						 
						
							
							
								
								Prepare for restart / crash detection rewrite.  
							
							 
							
							
							
						 
						
							2013-02-24 11:25:01 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									EcoCityCraft 
								
							 
						 
						
							
							
							
							
								
							
							
								24c14b8aef 
								
							 
						 
						
							
							
								
								Automatically update upstream versions. Bukkit-1.4.7-R1.0-3-g0b494f8, CraftBukkit-1.4.7-R1.0-9-g65324d6  
							
							 
							
							
							
						 
						
							2013-02-22 22:56:37 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								6e73bed17b 
								
							 
						 
						
							
							
								
								Start metrics only once  
							
							 
							
							
							
						 
						
							2013-02-23 09:59:26 +11:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									md_5 
								
							 
						 
						
							
							
							
							
								
							
							
								20d7972801 
								
							 
						 
						
							
							
								
								Add aikar.co url too  
							
							 
							
							
							
						 
						
							2013-02-23 09:52:23 +11:00