SteamWar/Paper
12
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,550 Commits 3 Branches 0 Tags
2d3da9ab4bf4ff0a2b28a67f22d373aa301e1b90
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
Zach Brown 538cd29d93 Update upstream B/CB 2017-01-14 02:11:12 -06:00
Zach Brown ce10eb73f0 Assign the World in WorldGenStronghold 
Fixes GH-580
 2017-01-14 01:24:11 -06:00
Zach Brown fe2f82587d Merge pull request #575 from prplz/fix-block-break-desync 
Fix block break desync
 2017-01-08 18:03:49 -06:00
Zach Brown eccac70eac Compromise on warning of excessive velocity sets 
We have long been receiving feedback about our warning messages when
excessive velocities are set on entities. We have, for the most part,
ignored much of this feedback because these warnings can be vital in
identifying the cause of a watchdog crash. These crashes would otherwise
be more difficult to identify without this information.

However, in many cases these warnings are unnecessarily verbose as the
server handles these excessive sets itself without user intervention.

As a compromise, we will only warn the user as part of a watchdog crash
log, and we will only include the most recent occurrence. This commit
represents a first effort on this front. It may need to be tweaked later
to provide more relevant information, such as the time it occurred,
and/or not printing the warning at all if the occurrence was a certain
time period ago.
 2017-01-08 16:43:08 -06:00
Zach Brown 7732ba46d9 Merge pull request #573 from dedicatedmemers/master 
Don't allow entities to become passengers of themselves
 2017-01-08 16:35:48 -06:00
Zach Brown c9c9032b8d Revert "Set head rotation pitch in addition to yaw in TPs" 
This reverts commit 87ebcab532.
 2017-01-07 22:15:01 -06:00
Zach Brown 87ebcab532 Set head rotation pitch in addition to yaw in TPs 2017-01-07 21:32:11 -06:00
Zach Brown b6dd3fb9d3 Update upstream B/CB 
Closes GH-569
 2017-01-06 15:45:59 -06:00
Zach Brown fb686972fa Update upstream B/CB 2016-12-30 23:52:19 -06:00
Zach Brown 3410e9035d Make invalid stat removal use proper config key 
Server-wide static config values should always be prefixed by
`settings.`. Get it right @Zbob750, geez

Issue introduced in f88edb00e9
 2016-12-27 19:23:18 -06:00
Zach Brown d6b19bb3c8 Update upstream CB 
Closes GH-556
 2016-12-27 18:46:41 -06:00
Zach Brown ac93a5cb00 Update usptream CB 2016-12-26 13:02:52 -05:00
Zach Brown e700f1f255 Update upstream B/CB 2016-12-24 17:05:51 -05:00
Zach Brown 54f0061ce5 Update upstream CB 2016-12-22 15:06:59 -06:00
Zach Brown 038cde138a Fix missed diff causing lava to move too quickly 
Missed diff from old patch file was causing lava to always move at the
faster 'nether' speed, ignoring the slower overworld speed entirely.
This is why we use obfuscation helpers now.

Fixes GH-521
 2016-12-21 15:29:50 -06:00
Zach Brown f88edb00e9 Add option to remove invalid statistics 
Closes GH-550
 2016-12-21 12:41:30 -06:00
Zach Brown 0fa5771dac Update to Paper to MC 1.11.2 2016-12-21 11:21:40 -06:00
Zach Brown 4bfa933c52 Cleanup 'nerfed spawner mobs can float' patch 2016-12-20 21:57:07 -06:00
Zach Brown cd80c0a2f7 Fix a merge conflict that was resolved improperly 2016-12-20 18:01:37 -06:00
Zach Brown ec68dfff5a Update Paper to MC 1.11.1 2016-12-20 16:34:27 -06:00
Zach Brown b3dd2f9212 Add obfhelper to vanish patch 2016-12-16 23:02:33 -06:00
Zach Brown 86ae842a36 Update upstream B/CB 2016-12-16 22:23:03 -06:00
Zach Brown 8076a6a231 Add ProjectileCollideEvent 
Base our vanish changes on top of that event.
 2016-12-16 22:13:45 -06:00
Zach Brown b17aa5f5ba Don't let FishingHooks use portals 
Closes GH-531
 2016-12-16 16:03:56 -06:00
Zach Brown dbfd2a3406 Update upstream B/CB 2016-12-16 15:00:16 -06:00
Zach Brown 659a7c955f Update upstream B/CB 
Fixes GH-542
 2016-12-12 14:21:28 -06:00
Zach Brown 67a9e0cbf6 Update upstream CB 2016-12-10 17:50:31 -06:00
Zach Brown b21c31c91d Update upstream B/CB 2016-12-09 18:07:35 -06:00
Zach Brown cead4e0a74 Update upstream B/CB 2016-12-06 17:12:19 -06:00
Zach Brown b75a37d67b Update upstream CB 2016-12-04 17:59:11 -06:00
Zach Brown 4acf56eb8b Update upstream, fix accidental removal from last 2016-12-02 21:11:39 -06:00
Zach Brown 9e40eaf85d Don't remove random diffs in update 2016-12-02 21:04:24 -06:00
Zach Brown f0e32d948f Update upstream CB 2016-12-02 18:07:07 -06:00
Zach Brown 90c9266a32 Update upstream B/CB some more 2016-12-01 19:34:07 -06:00
Zach Brown 9317149ab5 Update upstream B/CB 2016-11-30 21:10:14 -06:00
Zach Brown 19e3622c64 Update upstream CB 2016-11-29 23:14:49 -06:00
Zach Brown b3d302b6db Update upstream CB 2016-11-29 18:02:20 -06:00
Zach Brown 3129310ffc Merge pull request #525 from jamierocks/pr/update-cb 
Update upstream CB
 2016-11-29 14:29:34 -06:00
Zach Brown 4241b49b85 Update upstream B/CB - hitEntity added upstream 2016-11-28 17:16:07 -06:00
Zach Brown 5a4d011af5 Merge pull request #519 from jamierocks/pr/update-inv 
Update inventory. Fixes #505
 2016-11-28 15:42:12 -06:00
Zach Brown e4b2d88214 More upstream CB 2016-11-27 17:37:38 -06:00
Zach Brown 1687e4c0aa Update upstream CB 2016-11-27 17:00:08 -06:00
Zach Brown d5240abbbd Update patch number 2016-11-27 16:54:10 -06:00