SteamWar/Paper
12
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,627 Commits 3 Branches 0 Tags
99f530c9370bedc19bb90ae0b85cdcbcf3e7cce3
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Zach Brown 5ad5423102 Merge pull request #771 from electronicboy/master 2017-07-03 15:42:22 -05:00
Zach Brown 65daf84cdb Block player logins during server shutdown 
Adds GH-765
 2017-07-02 21:37:56 -05:00
Zach Brown f63f531f42 Make timings more tolerant of corrupt chunks 
Fixes GH-744
 2017-07-02 20:54:29 -05:00
Zach Brown e644762d67 Update upstream S 
Fixes build
 2017-06-25 18:37:00 -05:00
Zach Brown 3f5b488720 Update upstream B/CB 2017-06-25 18:00:32 -05:00
Zach Brown 7409728bf3 Update upstream CB 2017-06-24 13:52:44 -05:00
Zach Brown 604b92968e Update upstream B/CB/S 2017-06-21 22:12:40 -05:00
Zach Brown cc32d61141 Merge pull request #759 from Minecrell/fix-color-encoding 2017-06-21 12:22:19 -05:00
Zach Brown 1c208bf05b Update upstream CB/S 2017-06-18 20:36:55 -05:00
Zach Brown 7b4fe3ed73 Update upstream CB 2017-06-17 14:18:29 -05:00
Zach Brown 9a3f146c2e Merge pull request #743 from Minecrell/ignore-eot 
Continue reading from console input after EOT
 2017-06-14 09:31:07 -05:00
Zach Brown a0f46a6932 Merge branch 'Minecrell/remove-windows-compat' 2017-06-13 20:30:08 -05:00
Zach Brown 964e06c9a5 Update upstream B/CB/S 2017-06-12 22:28:09 -05:00
Zach Brown 29bba5da9c Update upstream CB 2017-06-11 23:25:44 -05:00
Zach Brown cd7f5199e8 Renumber patches, fix conflicts, update for 1.12 2017-06-11 20:02:57 -05:00
Zach Brown bdd63e020c Merge pull request #728 from Minecrell/terminalconsoleappender 
Improve console implementation
 2017-06-11 15:12:27 -05:00
Zach Brown e3dd2d2df2 Update upstream CB/S 2017-06-11 12:03:07 -05:00
Zach Brown 3b5e6cd48f Properly fix JavaDoc linting issues 
Fixes our own, and upstream's, issues with the stricter Java 8 JavaDoc
linter.

Also removes the destroystokyo-release maven repository. I'm not sure
why I added it originally, but it's unnecessary now.
 2017-06-10 17:11:10 -05:00
Zach Brown 6caa4fe122 Go back to disabling javadoc linting for now 
It's breaking our maven deployments. This should be fixed properly in
the future when I have more time and have had less to drink.
 2017-06-09 19:40:41 -05:00
Zach Brown 31eca1627b Merge pull request #722 from electronicboy/master 
Re: Actually exit the JVM after stopping the server when /restart is ran
 2017-06-08 21:08:40 -05:00
Zach Brown bdeb75ada8 Remove 1.12 prerelease changes patch 2017-06-08 17:19:12 -05:00
Zach Brown f061b704bd Merge pull request #718 from electronicboy/pre/1.12 
Update Paper to MC 1.12
 2017-06-08 09:37:29 -05:00
Zach Brown 30cc65c220 Update upstream B/CB 2017-06-04 15:11:50 -05:00
Zach Brown 74ffc20767 Update upstream B/CB 2017-06-02 23:41:05 -05:00
Zach Brown 529a9626f4 Update upstream B/CB 2017-05-29 16:11:54 -05:00
Zach Brown 9534f437f4 Add more info, triggers to watchdog velocity warn 
Adds entity name to exception message
Checks that the velocity to be set is NaN
 2017-05-28 00:06:26 -05:00
Zach Brown d1a100c11e Remove unnecessary doclint param on API 2017-05-27 23:36:18 -05:00
Zach Brown 81159a37d4 Update upstream B/CB/S 2017-05-27 23:25:17 -05:00
Zach Brown 914c16f3b2 Bump outdated build notification back out to norm 
Merge outdated notification patch into existing branding patch
 2017-05-26 22:46:27 -05:00
Zach Brown a044ef0e9f Update upstream B/CB 2017-05-26 22:09:24 -05:00
Zach Brown 16113437c6 Update upstream B/S 2017-05-23 17:11:28 -05:00
Zach Brown b39f2133a1 Update Paper to MC 1.12-pre5 2017-05-20 23:41:39 -05:00
Zach Brown 8fb32efc40 Merge branch 'master' into pre/1.12 2017-05-18 18:43:21 -05:00
Zach Brown e5315ba7cb Merge pull request #700 from electronicboy/master 
Actually exit the JVM after stopping the server when /restart is ran
 2017-05-18 18:39:20 -05:00
Zach Brown 43a4d24ea0 Merge branch 'master' into pre/1.12 2017-05-17 17:52:45 -05:00
Zach Brown d67b067983 Update upstream CB 2017-05-17 17:24:58 -05:00
Zach Brown d4441c91ef Add an option to make parrots stick to shoulders 
When enabled, Parrots will not fly off of a player's shoulder everytime
they change Y level, touch water, sneeze, etc.
Instead, a player must toggle shift to "shake" the parrots off.
 2017-05-16 21:34:47 -05:00
Zach Brown edfd5eda4f Update upstream B/CB 2017-05-16 17:17:58 -05:00
Zach Brown f7d8aa4188 Update upstream B/CB/S 2017-05-15 11:25:20 -05:00
Zach Brown b75e22ccb2 Merge branch 'master' into pre/1.12 2017-05-15 10:57:42 -05:00
Zach Brown 2d3da9ab4b Merge pull request #693 from electronicboy/master 
Allow the watchdog to try sanely stopping the server
 2017-05-15 10:46:00 -05:00
Zach Brown 22910b09c3 Switch 1.12-pre2 to its own version checks 
Fix stream formatting issue that had been bugging me
 2017-05-15 10:28:28 -05:00
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
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
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
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
Zach Brown 1f5692bf4b Merge pull request #636 from electronicboy/paper-maczsh 
paper tools - fix shell matching
 2017-03-17 20:29:42 -05: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
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
Zach Brown a69434f9d1 Update upstream B/CB/S 
Closes GH-631
 2017-03-15 09:32:50 -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
Zach Brown f17c296756 Do not let ArmorStands drown under water 2017-02-18 19:34:46 -06:00
Zach Brown 12310fa5f3 Update upstream B/CB/S 2017-02-17 20:03:38 -06:00
Zach Brown 429c24e8c9 Merge pull request #611 from Spottedleaf/asm-fix 
Fix #610
 2017-02-14 16:00:13 -06:00
Zach Brown 3e91cc60e4 Update upstream B/CB/S 2017-02-10 18:12:58 -06:00
Zach Brown 3f2569f79f Disable Spigot's chunk unload queue throttling 
Seems to be causing more problems than it's solving
Closes GH-597
 2017-02-07 16:59:12 -06:00
Zach Brown e741a89374 Update upstream CB, reduce version cache time 
Closes GH-602
 2017-02-07 16:29:26 -06:00
Zach Brown e3b3799b67 Update upstream S 2017-02-04 03:59:44 -06:00
Zach Brown 789bb0b834 Update upstream CB 
Closes GH-596
 2017-02-01 22:48:16 -06:00
Zach Brown a3cc3e37bd Update upstream S 2017-01-30 22:33:54 -06:00
Zach Brown 013c024ca2 Update upstream CB 2017-01-28 17:36:03 -06:00
Zach Brown 65a99a06a8 Update upstream B/CB/S 2017-01-25 22:27:42 -06:00
Zach Brown 21a724147a Do not allow a zero max height in BiomeJungle 
Fixes GH-592

Thanks to the forge team who noticed this issue long ago
 2017-01-23 15:11:07 -06:00
Zach Brown bff3f5cccd Yank import from last 2017-01-21 17:12:25 -06:00
Zach Brown 4cce8f0cda Expose WorldBorder@isInBounds(Location) check 2017-01-21 17:06:28 -06:00
Zach Brown 51072f8241 Fixup patch file 2017-01-20 09:12:47 -06:00
Zach Brown b0348aea3e Update upstream B/CB/S 2017-01-20 05:21:44 -06:00
Zach Brown f37dddfe3e Merge pull request #582 from prplz/player-count 
Add World.getPlayerCount
 2017-01-14 16:07:01 -06:00
Zach Brown 26f60ea587 Now I am become Death, the destroyer of newlines 2017-01-14 02:12:59 -06:00