Zach Brown
5f3d5d8170
Fix patch conflict with upstream
2017-04-22 17:49:47 -05:00
Zach Brown
f68b2ab95e
Update upstream CB/S
2017-04-22 17:41:28 -05:00
Zach
f9282c890d
Merge pull request #669 from electronicboy/remove-maps-patch
...
Remove Ignore invalid Marker Icon ID's in maps
2017-04-22 17:39:40 -05:00
Shane Freeder
ffb572ce9a
Remove Ignore invalid Marker Icon ID's in maps
...
Spigot has patched this issue inside MapIcon, meaning that we no longer need to maintain this patch; Spigots patch also fixes #668 in that it will verify the length of the array, as well as protect against a negative type value being fetched from the array. Only real change is that Spigots patch returns a MapIcon.Type.PLAYER, instead of the RED_MARKER as originally PR'd by Aikar.
2017-04-22 15:52:56 +01:00
Shane Freeder
7afde8f75f
Use lastIndexOf in Metrics class to futureproof
...
Because who's going to remember to change that line...
2017-04-22 02:37:58 -05:00
Zach Brown
2db4e57e4d
Update bStats implementation
2017-04-22 01:16:45 -05:00
Zach Brown
9db28f00db
Update upstream B/CB
2017-04-21 23:42:59 -05:00
Zach
56ba57b210
Merge pull request #663 from electronicboy/player-death-passenger-bug
...
Call stopRiding() on a Players death
2017-04-21 18:06:53 -05:00
Zach Brown
2f7c5949d0
Update upstream CB
2017-04-20 18:12:03 -05:00
Zach Brown
d5cf14188a
Update upstream B/CB
2017-04-20 08:22:40 -05:00
Shane Freeder
674913df0a
Call stopRiding() on a Players death
...
Currently, when a player dies they are not automatically ejected from the entity they are riding, which allows
for the ridden entity to affect the players location on respawn (we're still riding it for a part of a tick), as well as allows a dupe to occur with the ridden entity teleporting to the new world with the player
2017-04-18 15:17:54 +01:00
Zach Brown
63beca49fe
Update upstream B/CB/S
...
Closes GH-658
2017-04-16 17:12:14 -05:00
Zach Brown
362e425271
Update upstream CB/S
2017-04-10 22:11:26 -05:00
kashike
19b5d5b124
Fix NFE caused by attempting to read an EMPTY ItemStack
...
Thanks @gabizou
2017-04-09 23:52:14 -07:00
Zach Brown
6127ca1b6e
Update upstream B/CB
2017-04-04 22:38:08 -05:00
Zach Brown
e4a071f6e4
Update upstream B/CB
2017-03-31 23:24:42 -05:00
Zach Brown
e6a7d357ce
Update upstream CB
2017-03-30 18:26:00 -05:00
Zach Brown
ae17d2c28c
Switch metrics impl to use thread executor service
2017-03-26 18:29:38 -05:00
Zach Brown
5e2784e941
Switch to a bStats based Metrics system
2017-03-25 00:22:02 -05:00
Zach
246712ed92
Merge pull request #628 from willies952002/feature/reloadCommands
...
Don't Display Success Message on Alias Reload Fail
2017-03-24 22:34:13 -05:00
Zach Brown
07d0098a9e
Update upstream B/CB/S
...
Adds /paper command for reloading the paper config.
Closes GH-639
Per-world config logging has been removed in favor of all or nothing
logging for all paper settings. I don't believe it was used enough to
warrant maintaining. If this is not the case it should be possible to
re-add it.
2017-03-24 22:27:43 -05:00
Zach Brown
1d87ea2179
Remove unnecessary blocking of chest minecarts
...
This is already covered by recent changes.
Closes GH-373
2017-03-19 16:17:24 -05:00
Zach Brown
dbabbdbdbe
Update upstream B/CB
2017-03-18 21:01:13 -05:00
Zach
2935dbafdb
Merge pull request #638 from electronicboy/master
...
Ensure that the world of a dead entity is not changed in a portal
2017-03-18 20:47:19 -05:00
Shane Freeder
02afedb602
Ensure that the world of a dead entity is not changed in a portal
2017-03-19 01:33:31 +00:00
Zach
a30343c85e
Merge pull request #636 from electronicboy/paper-maczsh
...
paper tools - fix shell matching
2017-03-17 20:29:42 -05:00
Shane Freeder
1b70427dfc
fix shell match to account for /usr/local for homebrew installs of zsh on macOS
2017-03-17 23:44:58 +00:00
Zach
fb0f8ba518
Merge pull request #635 from electronicboy/master
...
Only set the location of the newly spawned entity
2017-03-17 15:41:07 -05:00
Shane Freeder
09e52007e3
Only set the location of the newly spawned entity
2017-03-17 13:17:52 +00:00
Zach Brown
60182fd473
Just make sure an entity's exit is set properly
...
Don't re-add, it's redundant and you end up with inconsistent
inconsistencies inconsistently
2017-03-17 00:50:43 -05:00
Zach Brown
08aa6e5f49
Make sure the entity is still added to the world
2017-03-17 00:09:26 -05:00
Shane Freeder
45ad47717e
Fix a duplicate alive entity on second world
2017-03-16 22:31:53 -05:00
Zach Brown
7f3aa1ed29
Update upstream B/CB/S
...
Closes GH-631
2017-03-15 09:32:50 -05:00
willies952002
77fdfd6de1
Don't Display Success Message on Alias Reload Fail
...
Also add "commands" to Tab Completion
Note: This required a signature change to Bukkit#reloadCommandAliases() so that it returns a boolean based on if the command aliases reloaded or not.
2017-03-12 13:52:04 -04:00
chickeneer
ff73ad6dde
Fix tick loop bug - Fixes #624
...
We were not calculating time after the sleep ,resulting in wrong
calculations. This caused us to go 100ms, 0ms, 100ms, 0 ms repeatedly.
2017-03-10 03:03:49 -05:00
Zach Brown
71d0330810
Update upstream S
2017-03-02 21:08:18 -06:00
Zach Brown
4b25be6d1f
Alter furnace cookTime based on total cook time
...
Fixes GH-613
2017-03-02 20:57:20 -06:00
Zach Brown
c7638800ac
Update upstream B/CB
2017-02-22 22:29:13 -06:00
Zach Brown
85aa230650
Do not let ArmorStands drown under water
2017-02-18 19:34:46 -06:00
Zach Brown
ae98591b8c
Update upstream B/CB/S
2017-02-17 20:03:38 -06:00
Zach
f654bf8fc2
Merge pull request #611 from Spottedleaf/asm-fix
...
Fix #610
2017-02-14 16:00:13 -06:00
Spottedleaf
f33f4b9c31
Use invokeinterface for methods defined in interfaces in the ASM executor
2017-02-14 03:04:20 -08:00
Zach Brown
5031a31da5
Update upstream B/CB/S
2017-02-10 18:12:58 -06:00
Brokkonaut
6b3c0bb3c6
Make chunk unload targetSize more aggressive
...
Re: GH-597
2017-02-08 15:16:36 -06:00
Zach Brown
03f1f9b06b
Disable Spigot's chunk unload queue throttling
...
Seems to be causing more problems than it's solving
Closes GH-597
2017-02-07 17:21:37 -06:00
Zach Brown
919cb9d19a
Update upstream CB, reduce version cache time
...
Closes GH-602
2017-02-07 16:29:26 -06:00
Aikar
ec31ab32af
Shame on you Mojang
...
Someone wrote some horrible code that throws a world accessing task
onto the HTTP DOWNLOADER Thread Pool, for an activity that is not even
heavy enough to warrant async operation.
This then triggers async chunk loads!
What in the hell were you thinking?
2017-02-05 19:19:35 -05:00
Aikar
c7d8bd43fb
Remove CraftScheduler Async Task Debugger
...
I have not once ever seen this system help debug a crash.
One report of a suspected memory leak with the system.
This adds additional overhead to asynchronous task dispatching
2017-02-05 00:13:28 -05:00
Aikar
d49de13c00
Add more timings to Scheduler and other improvements
2017-02-05 00:13:16 -05:00
Aikar
ee7f13ea3c
Add API to get the url in a timing report listener
2017-02-04 23:07:09 -05:00
