Zach Brown
a639c9b080
Merge pull request #327 from Brokkonaut/master
...
Update upstream CB/S
2016-06-09 12:35:28 -05:00
Brokkonaut
044978f8cc
Update upstream CB/S
2016-06-09 19:28:16 +02:00
Zach Brown
8ab69858ac
Update upstream CB
2016-06-09 00:24:23 -05:00
Zach Brown
9b192b2708
Update to Minecraft 1.10
2016-06-08 22:57:14 -05:00
chickeneer
f53bec077b
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
c9bf3f3819
Fix issue with chests being erased - #322 Fixed
2016-06-07 03:03:51 -04:00
Aikar
85df861eda
more chunk unload queue fixes, hopefully fix various odd bugs
2016-06-07 02:08:59 -04:00
Aikar
49c8b34653
Fix bug with lootable refresh not saving inventory if on
2016-06-06 19:56:51 -04:00
Zach Brown
bdc783f176
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
74a3b887ff
Make falling block height nerf respect doEntityDrops
2016-06-06 21:14:35 +02:00
Aikar
fbcd3ce763
Add sub timings to chunk map
2016-06-05 00:10:50 -04:00
Zach Brown
ebfc40dde6
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
0369cec5a0
Add notes about the configs and obfuscation helpers to CONTRIBUTING.md
2016-06-04 18:16:31 -05:00
Zach Brown
d9e7de59e9
Fix a few global configuration options being unavailable
2016-06-04 17:26:11 -05:00
Aikar
e18cef3e72
remove part of my hopper patch, not sure its doing what I intended
2016-06-04 11:52:25 -04:00
Aikar
ec95eb86f7
Update Upstream
2016-06-04 11:41:04 -04:00
Martin Panzer
fb10fff9b0
Fix fallingblocks getting stuck on fences
2016-06-04 10:11:03 +02:00
Zach Brown
44ddc211c4
Update upstream
2016-06-01 22:52:52 -05:00
Aikar
ba0a4c75bd
Only send Dragon/Wither Death sounds to same world
...
Also fix view distance lookup
2016-05-31 23:56:19 -04:00
Aikar
a9ec7b3a75
Fix skeleton horse spawn chance ignoring difficulty modifier if custom set
...
Also reduce diff
2016-05-30 12:50:57 -04:00
Zach Brown
44857e00e2
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
6c11d95680
Update upstreams
2016-05-29 18:32:21 -05:00
Zach Brown
a618f33267
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
805e5c6be7
Add server-name as server parameter
2016-05-28 12:02:57 +02:00
Aikar
d9971432c2
re-add timing that spigot missed
2016-05-27 22:29:09 -04:00
Aikar
e9c7cca230
Ensure chunks never load async
...
Force operation to main thread if it occurs async
2016-05-27 22:28:23 -04:00
Zach Brown
ff2c1ee38e
Update upstreams
2016-05-27 21:22:18 -05:00
Aikar
cac7bbc139
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
45aa7db5c4
Update Upstream
2016-05-25 12:37:17 -04:00
Martin Panzer
bd2fb5d530
Optimize Redstone torch list removal
2016-05-24 20:08:40 -05:00
Zach Brown
50277c2ceb
Remove comment and fix build }}}}}
2016-05-22 21:20:15 -05:00
Zach Brown
4e74c43218
Re-add some method synchronization and move to a SingleThreadedExecutor in MCUtils
2016-05-22 21:14:17 -05:00
Zach Brown
87366c4f4d
Temporarily remove synchronization from UserCache optimizations
...
In regards to GH-301
2016-05-22 21:07:40 -05:00
Zach Brown
5f6f6c6321
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
32ea7542d2
Update upstream CB
...
Closes GH-303
2016-05-21 22:07:14 -05:00
Zach Brown
143ab568d4
Update B/CB/S
...
Closes GH-288
2016-05-20 17:32:50 -05:00
Aikar
8bee892ded
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
Aikar
c623104ffa
MC-99914 - ensure EntityItem loads before EntityPotion
2016-05-16 22:54:48 -04:00
Aikar
4bead5b898
bump the default maxMobSpawns default to 250, and add support for unlimited
...
Use -1 to represent vanilla/unlimited.
Updated PaperWorldConfig to also update the individual worlds limit if it was set
to the new default value.
Should hopefully help #235
2016-05-16 22:07:12 -04:00
Aikar
478f246490
Optimize UserCache / Thread Safe
...
Because Techable keeps complaining about how this isn't thread safe,
easier to do this than replace the entire thing.
Additionally, move Saving of the User cache to be done async, incase
the user never changed the default setting for Spigot's save on stop only.
2016-05-16 21:14:28 -04:00
Aikar
1a5414bc4e
Add Async Helper method to MCUtil
2016-05-16 20:50:09 -04:00
Zach Brown
af4db4ddea
[16:55:31] *mibby pokes upstream
2016-05-16 17:00:53 -05:00
Aikar
e4c179e827
Refactor Lighting Queue System
...
may help #284
Cleans up the lighting queue system, reducing diff and improving implementation.
We no longer stop chunk unloads due to lighting updates, and instead simply flush the lighting queue.
The cost of forcing the chunk (and its neighbors!) to stay loaded waiting for its
lighting work to finish is much greater than simply taking the hit and doing the work.
This change also helps reduce the diff and avoid bugs with missed diffs by removing
duplicated logic.
Also switches to a more effecient data structure (ArrayDeque instead of LinkedList) for the queue itself.
2016-05-15 18:48:39 -04:00
Aikar
8e62fb709b
Timings v2: Start methods return self for use in try-with-resources
...
try (Timing ignored = timing) {
// Code to time
}
// auto stops timing, even if you return in 42 other places in the block
2016-05-15 17:34:26 -04:00
Zach Brown
b9c321ff21
TileEntityLootable can call processRefill with a null player
...
Seems specific to EntityMinecartChest
Fixes GH-290
2016-05-15 01:41:36 -05:00
Aikar
0c78971552
More cases of avoiding marking active for chunks, to stop potential leaks
2016-05-13 22:27:20 -04:00
Aikar
016dca3390
Bring back an EAR optimization from 1.9.2
2016-05-13 01:39:03 -04:00
Aikar
b6d0dd32c6
Fix chunk leak issue with queued light updates
2016-05-13 01:34:37 -04:00
Zach Brown
f623f903cd
Move bad command registration workaround into SMP#dispatch
...
Fixes GH-274
2016-05-13 00:13:38 -05:00
Zach Brown
f30c245be2
Make watchdoge disabler its own patch file
...
Change implementation, smaller diff, less NPE
2016-05-12 23:04:49 -05:00