SteamWar/Paper
12
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,431 Commits 3 Branches 0 Tags
6a3e97e28adc15e5669c473eaef3ff60a22b7d0d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Zach Brown ede6f9994d Merge pull request #517 
Don't process packets from offline players
 2016-11-27 16:23:17 -06:00
Zach Brown 1881616f15 Alter last to force conflicts but keep contents 2016-11-26 22:02:19 -06:00
Zach Brown 194025fc1b Update upstream B/CB/S 2016-11-26 21:36:05 -06:00
Zach Brown 5cc2d45a03 Update upstream B/CB/S 2016-11-24 21:12:18 -06:00
Zach Brown b44bb52488 Update upstream B/CB/S 2016-11-22 18:06:14 -06:00
Zach Brown fa0bd763ae Merge pull request #490 from mikroskeem/master 
Fix building when parent directory with spaces is used
 2016-11-21 16:32:17 -06:00
Zach Brown fb14193e53 Update upstream B/CB 2016-11-21 15:51:27 -06:00
Zach Brown b97f0ee0e4 Update upstream CB 2016-11-20 17:02:00 -06:00
Zach Brown 6b64111273 Update upstream CB 2016-11-19 21:30:09 -06:00
Zach Brown 3df7a09e64 Update upstream CB 2016-11-19 17:24:37 -06:00
Zach Brown 464b0455bd Add ShulkerBoxes to the LootTable API 2016-11-19 11:31:01 -06:00
Zach Brown 3efba978ad Update upstream B/CB 2016-11-19 11:27:13 -06:00
Zach Brown 2b8aa1a8f2 Simplify the affects spawning API implementation 
Get the hell away from EntitySelectors, not that that one right anyway
Fixes GH-482
 2016-11-18 18:55:14 -06:00
Zach Brown 4832b1a385 Update Paper to MC 1.11 2016-11-16 20:23:38 -06:00
Zach Brown 6b146ebec2 Expand NBT filtering from last commit 
cc GH-478
 2016-11-13 19:36:23 -06:00
Zach Brown 513118af55 Filter bad data from ArmorStand and SpawnEgg items 
Fixes GH-478
 2016-11-12 23:29:32 -06:00
Zach Brown c8051323cd Update upstream B/CB/S 2016-11-12 20:21:46 -06:00
Zach Brown 8fd92641f7 Remove log redirection in CB init script 
This section seems to be a relatively common source of errors. We may as well be as
verbose as the command output, at least for this section.
 2016-11-11 13:57:09 -06:00
Zach Brown f3fd0471f2 Always cleanup collideRule teams at startup 
Fixes GH-463
 2016-11-05 13:34:18 -05:00
Zach Brown da6e2f40a9 Update upstream CB 2016-11-04 22:37:19 -05:00
Zach Brown 4916cf72cb Raise packet tolerance in spam threshold patch 
Fixes GH-462
 2016-11-04 22:31:37 -05:00
Zach Brown 8c5be62ad9 MC uses JSR 1.3.9 2016-11-03 14:51:00 -05:00
Zach Brown 2e15610701 t 2016-11-03 14:28:58 -05:00
Zach Brown 2ea9521f37 Update upstream B/CB 2016-11-03 14:27:37 -05:00
Zach Brown c189dd9576 Move nullable annotation dependency to JSR 2016-11-03 14:25:50 -05:00
Zach Brown e49e4020ac Remove some handlers 2016-10-30 21:42:38 -05:00
Zach Brown b2b163b8ec Add usage message to ReloadCommand 
Used when the wrong arguments are supplied, missed when we added the
permissions reload functionality.
 2016-10-30 00:13:31 -05:00
Zach Brown 122d3d9d43 Update upstream S 2016-10-26 16:05:22 -05:00
Zach Brown ba280d2292 Update upstream CB 2016-10-24 21:03:31 -05:00
Zach Brown 5b6d46e4c8 Update upstream CB 2016-10-23 01:32:04 -05:00
Zach Brown 3552c9103a Revert CB's SPIGOT-1903 fix in favor of ours 
Fixes GH-453
 2016-10-22 15:36:19 -05:00
Zach Brown 714413ff1e Update upstream CB 2016-10-22 15:24:15 -05:00
Zach Brown 745be9013b Remove changes to lava/water cobblestone gen 
Unintended side effects in recent versions, this patch has likely
outlived its usefulness.

Closes GH-452
 2016-10-21 16:08:34 -05:00
Zach Brown 4bef47531a Properly update patches for upstream merge 2016-10-21 15:42:49 -05:00
Zach Brown 2515c80051 Update upstream B/CB 2016-10-21 15:28:44 -05:00
Zach Brown 0df1dae663 Update upstream CB 2016-10-16 15:35:34 -05:00
Zach Brown f1e5f599ca Update upstream CB/S 2016-10-13 17:29:38 -05:00
Zach Brown 8e6ecaeae0 Update upstream CB 2016-10-10 21:29:08 -05:00
Zach Brown d5ae910f82 Add option to remove corrupt tile entities 
Closes GH-437
 2016-10-05 16:28:17 -05:00
Zach Brown 40f1788ef3 Update upstream CB 2016-10-05 16:08:40 -05:00
Zach Brown 6d41d88931 Remove TE Fixer changes 
Ultimately they should be unnecessary now that upstream's fix has been
in place for a while. Removing this reduces our own footprint, and gets
rid of any possible unintended behavior.
 2016-10-05 15:46:44 -05:00
Zach Brown ab9bbceba9 Update paperclip 2016-10-01 22:23:28 -05:00
Zach Brown abd7523079 Update upstream B/CB/S 2016-10-01 11:47:56 -05:00
Zach Brown baf3b3371a Merge pull request #434 from kashike/fix/timings-verbose 
Fix @aikar's oops with verbose timings
 2016-09-23 18:25:50 -05:00
Zach Brown dd0277fdb5 Raise bad Y auto fix to avoid gameplay issues 
Per discussion here, https://github.com/PaperMC/Paper/commit/663fbf798e2ee60791f5489f4c3296145a0a4769#commitcomment-19153154
 2016-09-23 17:25:21 -05:00
Zach Brown d6618994b5 Update upstream CB 2016-09-20 15:59:26 -05:00
Zach Brown 7ec7c0ed95 Merge pull request #428 from kashike/feature/configurable-kick-messages 
Configurable flying kick messages
 2016-09-19 20:11:51 -05:00
Zach Brown bc24e29dc5 Update upstream CB 2016-09-18 13:37:38 -05:00
Zach Brown d9c982ac17 Add javax.annotations to the API 
Used this set specifically because they are present in NMS already.
 2016-09-16 14:38:52 -05:00
Zach Brown 66dc00b4dd Stop collideRule team from seeing invis 'friends' 
More appropriately aligns ourself with the no team option, because the
collideRule team is only a team because it has to be, not because we want
anyone to have any sort of gameplay based relationship.

Also block any options from being set on this team to further enforce that
it is not a persistent team and should not be treated as such.
 2016-09-15 16:36:57 -05:00
Zach Brown e4251a092b Block minecart portal teleports in some instances 
Mitigates GH-373
Technically a workaround rather than a true fix
 2016-09-14 18:52:41 -05:00
Zach Brown ca7a828688 Update upstrean CB/S 2016-09-11 14:55:02 -05:00
Zach Brown 4bf0ca21fe Make UseItem rate limiting stricter, configurable 2016-09-10 23:27:07 -05:00
Zach Brown 5ba385dd4c Fix patch, need to investigate build issues 2016-09-10 22:45:09 -05:00
Zach Brown 4b7796fe7c [ WHITESPACE ] 2016-09-10 22:09:14 -05:00
Zach Brown 4dcb73693a Add rate limiting to PacketPlayInUseItem as well 
Also removes our toggle for Spigot's option, I doubt anyone uses it.
 2016-09-10 21:42:47 -05:00
Zach Brown 89b26bb90d Commit CB changes as "Auto" 
Helps when using git's annotate function
 2016-09-10 21:31:32 -05:00
Zach Brown b0a15ca1ea Further safety for player collision setting 
Hopefully the end of similar problems
Fixes GH-415
 2016-09-08 12:39:40 -05:00
Zach Brown 098dae2524 Run paper upstream from anywhere 
woops
 2016-09-07 19:45:47 -05:00
Zach Brown 7bd3964037 [CI-SKIP] Fix CONTRIBUTING.md formatting 2016-09-06 15:01:46 -05:00
Zach Brown 6dedb92652 Make collide team removal more patient, safer 
Fixes GH-414
 2016-09-06 12:33:47 -05:00
Zach Brown 64c6e06d95 Update upstream B/CB/S 2016-09-05 14:21:03 -05:00
Zach Brown 949fc0534f Create a team as needed for disabling collisions 
Fixes GH-383
 2016-09-04 17:29:25 -05:00
Zach Brown b4eceb16ec Update upstream B/CB 2016-09-04 16:59:06 -05:00
Zach Brown 65858cf283 Merge pull request #408 from kashike/feature/health-conversion 
Convert new health to a float
 2016-09-04 16:05:38 -05:00
Zach Brown e1423d87ba Update upstream B/CB/S 2016-09-02 22:44:52 -05:00
Zach Brown 2df56fa35b Revert team creation for player collision setting 
Needs more work, have redone it locally but its not quite ready for
prime time.
 2016-08-31 19:22:43 -05:00
Zach Brown 0ccbb356f1 Rename patch file to be more specific 2016-08-31 17:18:54 -05:00