Commit graph

2550 commits

Author SHA1 Message Date
Zach Brown
ab4ae72fd5 Update to MC 1.12-pre2 2017-05-14 13:05:01 -05:00
Zach Brown
b712d77d72 Update API patches to MC 1.12pre2 2017-05-14 08:46:44 -05:00
Zach Brown
afaba00192 Update Paperclip 2017-05-14 04:23:06 -05:00
Zach Brown
2c33c8b106 Update upstream CB 2017-05-13 20:37:46 -05:00
Zach Brown
c480f39ff9 Add system property to disable book size limits 2017-05-13 20:26:19 -05:00
Zach Brown
54e5a2e4da Publicly execute the main thread at dawn
GH-684

Better handles most true deadlock situations
2017-05-13 05:51:09 -05:00
Zach Brown
302f743310 Properly handle async calls to restart the server
GH-681
2017-05-12 23:49:59 -05:00
Zach Brown
26d7646a75 Update upstream B/CB/S 2017-05-04 18:08:52 -05:00
Zach Brown
d3f692b39b Raise book max title length to 32 2017-04-29 20:43:14 -05:00
Zach Brown
64b19558b6 Remove last bit of chunk exists region file fix
CraftBukkit removed their implementation that caused this issue,
switching to Mojang's implementation which doesn't appear to share it. I
already removed the important bit in the last upstream merge, this is
just unused and unnecessary now. So we remove it.
2017-04-29 05:27:31 -05:00
Zach Brown
2671b8b308 Update upstream B/CB/S 2017-04-28 19:25:52 -05:00
Zach Brown
d8c3e02ad6 Update upstream S 2017-04-25 18:22:29 -05:00
Zach Brown
6645aa1301 Fix patch conflict with upstream 2017-04-22 17:49:47 -05:00
Zach Brown
2aca63ddef Update upstream CB/S 2017-04-22 17:41:28 -05:00
Zach Brown
9a6110578b 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
4200b785dc 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:32:06 +01:00
Shane Freeder
24f6670a17 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
22e2858fee Update bStats implementation 2017-04-22 01:16:45 -05:00
Zach Brown
0d1f8be81d Update upstream B/CB 2017-04-21 23:42:59 -05:00
Zach Brown
17a3117d38 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
724a156e6f Update upstream CB 2017-04-20 18:12:03 -05:00
Zach Brown
90927cd654 Update upstream B/CB 2017-04-20 08:22:08 -05:00
Shane Freeder
a4036ed3cb 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:08:27 +01:00
Zach Brown
515506c3ce Update upstream B/CB/S
Closes GH-658
2017-04-16 17:12:01 -05:00
Zach Brown
9aba83bfdc Update upstream CB/S 2017-04-10 22:11:26 -05:00
Riley Park
965f78b3af Fix NFE caused by attempting to read an EMPTY ItemStack
Thanks @gabizou
2017-04-09 23:50:46 -07:00
Zach Brown
3ef2557fe5 Update upstream B/CB 2017-04-04 22:38:08 -05:00
Zach Brown
66a6db73e0 Update upstream B/CB 2017-03-31 23:24:42 -05:00
Zach Brown
bc4e080971 Update upstream CB 2017-03-30 18:26:00 -05:00
Zach Brown
b6fe136d35 Switch metrics impl to use thread executor service 2017-03-26 18:29:38 -05:00
Zach Brown
4340ef97ca Switch to a bStats based Metrics system 2017-03-25 00:22:02 -05:00
Zach Brown
1471ac1b64 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
de6a101264 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:18:58 -05:00
Zach Brown
eb4870b509 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
b73556fc5c Update upstream B/CB 2017-03-18 21:01:13 -05:00
Zach Brown
d45f89aaa1 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
4a48c0504f Ensure that the world of a dead entity is not changed in a portal 2017-03-19 01:33:26 +00:00
Zach Brown
1f5692bf4b Merge pull request #636 from electronicboy/paper-maczsh
paper tools - fix shell matching
2017-03-17 20:29:42 -05:00
Shane Freeder
e71f0a9776 fix shell match to account for /usr/local for homebrew installs of zsh on macOS 2017-03-17 23:37:16 +00:00
Zach Brown
9e682ed074 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
33b8a43e4a Only set the location of the newly spawned entity 2017-03-17 13:17:52 +00:00
Zach Brown
5916c653b6 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
0b19d62632 Make sure the entity is still added to the world 2017-03-17 00:04:34 -05:00
Shane Freeder
4a940edbe8 Fix a duplicate alive entity on second world 2017-03-16 22:31:53 -05:00
Zach Brown
a69434f9d1 Update upstream B/CB/S
Closes GH-631
2017-03-15 09:32:50 -05:00
willies952002
cb08e8ae4c 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:19:04 -04:00
chickeneer
0c8c9b087a 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:01:46 -05:00
Zach Brown
b7442eaf52 Update upstream S 2017-03-02 21:08:18 -06:00
Zach Brown
252bca6deb Alter furnace cookTime based on total cook time
Fixes GH-613
2017-03-02 20:57:20 -06:00
Zach Brown
14e7575684 Update upstream B/CB 2017-02-22 22:29:13 -06:00