Commit graph

2232 commits

Author SHA1 Message Date
Zach Brown fab2a52fe1
Fix missed case in top of nether void damage patch
General cleanup, etc.
Closes GH-343
2016-06-18 01:06:37 -05:00
Daniel Ennis 37f586b611 Merge pull request #340 from phase/master
Fix infinite loop when saving chunks
2016-06-17 18:56:51 -04:00
Jadon Fowler f9837e4068
Fix infinite loop when saving chunks
Running `/save-all flush` would start an infinite loop that prints:
    ThreadedAnvilChunkSotrage (world): All chunks are saved
2016-06-17 02:29:57 -07:00
Zach Brown d73cd6a4bc
Update upstream B/CB/S 2016-06-16 20:27:47 -05:00
Zach Brown cabb2450ed
Remove timings addition that was fixed upstream 2016-06-15 17:51:30 -05:00
Zach Brown cd6dadb8bc
Update upstreams 2016-06-15 17:43:51 -05:00
Zach Brown 98d1d2ac57
Update upstream B/CB
Merges fixes for SPIGOT-2404 and SPIGOT-2408 into Paper
2016-06-13 18:42:08 -05:00
Zach Brown 5bad141169
Update upstream CB/S 2016-06-12 12:00:07 -05:00
Zach Brown 14ffaf5d2c
Update upstream B/CB 2016-06-11 22:22:27 -05:00
Jedediah Smith 83191ef7a1
Resolve an ISE in MagmaBlock damage handling 2016-06-11 19:10:37 -05:00
Zach Brown 4924e9398f
MC-80966 - Always send chunk sections 2016-06-11 14:59:28 -05:00
Zach Brown 47db868df1
Update upstream and rebuild 2016-06-11 14:58:54 -05:00
Zach Brown b864322a18
Simplify getEntity by UUID patch, misc readme changes 2016-06-09 21:43:32 -05:00
Zach f4353accf6 Merge pull request #327 from Brokkonaut/master
Update upstream CB/S
2016-06-09 12:35:28 -05:00
Brokkonaut ace471101b Update upstream CB/S 2016-06-09 19:28:16 +02:00
Zach Brown 1fcc7495cd
Update upstream CB 2016-06-09 00:24:23 -05:00
Zach Brown c442e96eb9
Update to Minecraft 1.10 2016-06-08 23:42:46 -05:00
chickeneer 171a079cd2 Fix Potion Equals Bug
Will be in Spigot 1.10, but getting it in for 1.9 users
2016-06-08 20:41:10 -04:00
Aikar 3201cfe07a Fix issue with chests being erased - #322 Fixed 2016-06-07 03:03:51 -04:00
Aikar a9d8237509 more chunk unload queue fixes, hopefully fix various odd bugs 2016-06-07 02:08:59 -04:00
Aikar 092733e8ff Fix bug with lootable refresh not saving inventory if on 2016-06-06 19:56:51 -04:00
Zach 3e06e28523 Merge pull request #321 from MyPlayPlanet/falling-block-height-doEntityDrops
Make falling block height nerf respect doEntityDrops
2016-06-06 17:39:43 -05:00
Martin Panzer cf65e06d96
Make falling block height nerf respect doEntityDrops 2016-06-06 21:14:35 +02:00
Aikar b394ec0472 Add sub timings to chunk map 2016-06-05 00:10:50 -04:00
Zach c2fd63eebf Merge pull request #317 from MyPlayPlanet/fix-fence-fallblock
Fix fallingblocks getting stuck on fences
2016-06-04 18:24:27 -05:00
Zach Brown 4da4bd812a
Add notes about the configs and obfuscation helpers to CONTRIBUTING.md 2016-06-04 18:16:31 -05:00
Zach Brown dbbf2eb27b
Fix a few global configuration options being unavailable 2016-06-04 17:26:11 -05:00
Aikar e483da14b5 remove part of my hopper patch, not sure its doing what I intended 2016-06-04 11:52:25 -04:00
Aikar f4a43ec92d Update Upstream 2016-06-04 11:41:04 -04:00
Martin Panzer 96a263cddf
Fix fallingblocks getting stuck on fences 2016-06-04 10:11:03 +02:00
Zach Brown e4e87d78ae
Update upstream 2016-06-01 22:52:52 -05:00
Aikar 4becba32a6 Only send Dragon/Wither Death sounds to same world
Also fix view distance lookup
2016-05-31 23:56:19 -04:00
Aikar 1aef85c2bb Fix skeleton horse spawn chance ignoring difficulty modifier if custom set
Also reduce diff
2016-05-30 12:50:57 -04:00
Zach a272c3c0cb Merge pull request #310 from MyPlayPlanet/server-name-param
Add server-name as server parameter
2016-05-29 18:35:03 -05:00
Zach Brown 0ae5768736
Update upstreams 2016-05-29 18:32:21 -05:00
Zach Brown 0a98d670fe
Stop relocating jopt-simple
Workaround for GH-189
Relocation breaks the lookup of a resource bundle, and this is easier than forking and maintaining our own version
 AFAIK this should be fine to do. Guess we'll see
2016-05-29 18:26:35 -05:00
Martin Panzer 7add3186a7
Add server-name as server parameter 2016-05-28 16:56:55 +02:00
Aikar a8d326f367 re-add timing that spigot missed 2016-05-27 22:29:09 -04:00
Aikar dfd19063f9 Ensure chunks never load async
Force operation to main thread if it occurs async
2016-05-27 22:28:23 -04:00
Zach Brown 06a6c422b4
Update upstreams 2016-05-27 21:22:18 -05:00
Aikar fe18b38aea Remove unneeded mob spawn cap patch - Fixes #235
I misread the code and thought the code kept looping until the mob spawn cap was hit.

Upon furthur review, this is not true, so this patch doesn't do anything sane.
2016-05-27 21:35:28 -04:00
Aikar 13492455a1 Update Upstream 2016-05-25 12:37:17 -04:00
Martin Panzer 391d0c04f8
Optimize Redstone torch list removal 2016-05-24 20:08:40 -05:00
Zach Brown b71c0e6f49
Remove comment and fix build }}}}} 2016-05-22 21:20:15 -05:00
Zach Brown 3ab1f229c5
Re-add some method synchronization and move to a SingleThreadedExecutor in MCUtils 2016-05-22 21:17:19 -05:00
Zach Brown aaf6c3f329
Temporarily remove synchronization from UserCache optimizations
In regards to GH-301
2016-05-22 21:07:45 -05:00
Zach Brown be3daf857b
Update old TNT cannon mechanics patch to 1.9.4
Behavior may be buggy or otherwise broken, testing with the option is needed.
`fix-cannons` has been removed in favor of `enable-old-tnt-cannon-behaviors`
2016-05-22 20:26:15 -05:00
Zach Brown 08701a47f7
Update upstream CB
Closes GH-303
2016-05-21 22:07:14 -05:00
Zach Brown df1df5d4b4
Update B/CB/S
Closes GH-288
2016-05-20 17:32:50 -05:00
Aikar d22f9071ff Avoid blocking on Network Manager creation
Fixes #294

Use a pending list to handle new connections so that the netty threads
do not block waiting for the main thread to finish ticking
2016-05-16 23:21:26 -04:00