Commit Graph

2677 Commits

Author SHA1 Message Date
Zach c55c93cb44 Merge pull request #428 from kashike/feature/configurable-kick-messages
Configurable flying kick messages
2016-09-19 20:11:51 -05:00
kashike 53997ebf2c Configurable flying kick messages
Closes #423
2016-09-20 00:59:36 +00:00
Zach Brown cf1b2e07f3
Update upstream CB 2016-09-18 13:37:38 -05:00
Zach Brown f7cfe1f769
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 14c974629c
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 eb3ff14afd
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 2b244fb51e
Update upstrean CB/S 2016-09-11 14:55:02 -05:00
Zach Brown 2e880e7676
Make UseItem rate limiting stricter, configurable 2016-09-10 23:27:07 -05:00
Zach Brown 5626ad5f58
Fix patch, need to investigate build issues 2016-09-10 22:45:09 -05:00
Zach Brown 8a8fc89534
[ WHITESPACE ] 2016-09-10 22:09:14 -05:00
Zach Brown c02c01b2c5
Add rate limiting to PacketPlayInUseItem as well
Also removes our toggle for Spigot's option, I doubt anyone uses it.
2016-09-10 21:44:06 -05:00
Zach Brown c094c7880d
Commit CB changes as "Auto"
Helps when using git's annotate function
2016-09-10 21:43:58 -05:00
Zach Brown 3a128de0c1
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 53bb048935
Run paper upstream from anywhere
woops
2016-09-07 19:48:52 -05:00
Zach Brown 9963d9d4ae
[CI-SKIP] Fix CONTRIBUTING.md formatting 2016-09-06 15:01:46 -05:00
Zach Brown feccc25412
Make collide team removal more patient, safer
Fixes GH-414
2016-09-06 12:33:47 -05:00
Zach Brown f5d7e2067d
Update upstream B/CB/S 2016-09-05 14:21:03 -05:00
Zach Brown d26051ef63
Create a team as needed for disabling collisions
Fixes GH-383
2016-09-04 17:29:25 -05:00
Zach Brown eb7e4424fa
Update upstream B/CB 2016-09-04 16:59:06 -05:00
Brokkonaut e153f46603
Fix an AIOOBE in inventory handling
Closes GH-404
2016-09-04 16:49:29 -05:00
Zach 8d5cd3f054 Merge pull request #408 from kashike/feature/health-conversion
Convert new health to a float
2016-09-04 16:05:38 -05:00
kashike 8f91416dcb @Zbob750 missed a few name changes 2016-09-04 06:35:42 +00:00
Zach Brown f9f96ea3a5
Update upstream B/CB/S 2016-09-02 22:44:52 -05:00
kashike e44b71a6b4 Convert new health to a float during set
Convert the new health value to a float before doing any validation logic
2016-09-01 23:32:32 +00:00
Zach Brown 8eb7f073d6
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 d8acf96e94
Rename patch file to be more specific 2016-08-31 17:18:54 -05:00
Aikar 3170a408da fix order of mc dev imports 2016-08-30 18:54:03 -04:00
killme 078b6fb1e0 Disable ticking of snow blocks 2016-08-30 23:45:59 +02:00
Zach Brown 8e220b8ef9
Make getEntity dead check more specific 2016-08-28 00:46:21 -05:00
Zach Brown ba4aaaa607
Restore some timings functionality lost in last 2016-08-27 19:36:26 -05:00
Zach Brown b170e8cedb
Update upstream B/CB/S
Remove two features added upstream
2016-08-27 18:41:58 -05:00
Zach Brown 16a7cf1c01
Update upstream CB 2016-08-21 14:52:19 -05:00
Aikar 173d0fa33f Timings v2 updates for more chunk related timings (generations) 2016-08-20 00:07:26 -04:00
Aikar 323c18dd65 Timings v2: confirm before reset. Add delays before report generation
Require user to confirm the timings reset, warning them that they should not be doing this.
Also require Timings to have ran for 3 minutes before allowing the report command.
Also require 1 minute intervals between reports to stop report spam.
2016-08-19 23:42:38 -04:00
Zach Brown c1932e0290
Add upstreamMerge script to paper tool 2016-08-19 16:02:31 -05:00
Alfie Cleveland d9afd08cee
Optimise BlockStateEnum 2016-08-19 13:06:37 -05:00
Zach Brown 17c9d7d9da
Kick git and rebuild patches 2016-08-15 19:22:10 -05:00
Zach Brown d5057a1488
Update upstream B/S 2016-08-15 18:51:55 -05:00
Zach Brown f80163c4ab
More changes to view distance API implementation
Should fix GH-381
2016-08-13 15:26:40 -05:00
Gabriele C e51a3a332e
Introduce a setting to handle offline proxies
Servers behind a bungeecord proxy in offline mode
will now properly pull offline mode UUIDs and data
when this setting is set to false. Default is unchanged.
2016-08-12 18:22:58 -05:00
Zach Brown 997fa37ee7
Update upstream B/CB 2016-08-11 15:07:07 -05:00
Zach Brown 15f3ca7ecb
Update upstream B/CB 2016-08-07 00:01:31 -05:00
Zach Brown 01a09f8ff1
Update maven repo urls 2016-08-06 16:49:55 -05:00
Zach Brown 9f95fbcd24
Send Bukkit scoreboards as well as vanilla boards
Fixes GH-384
2016-08-04 19:46:35 -05:00
Zach Brown c5f0256084
Syntax highlighting and typo fix in CONTRIBUTING
Thanks @jamierocks
2016-08-04 17:47:12 -05:00
Zach Brown ae77393ad9
Re-track players that dismount from other players
Fixes GH-265
2016-07-31 16:33:25 -05:00
Zach Brown af70722300
Fix entity tracking when the player is the vehicle
Fixes GH-378
2016-07-31 15:22:25 -05:00
Zach Brown 2763f8fe5e
Randomly generate team names for earlier commit
[17:17] _MylesC: the biggest issue you run into is bungee not handling
2 teams with same name :(
http://i.imgur.com/jbDigxW.png
2016-07-30 18:13:56 -05:00
Zach Brown 8f6208b1d3
Send a fake team as needed for the collision rule 2016-07-30 17:04:39 -05:00
Zach Brown 46bfd418a8
Update upstream B/CB/S 2016-07-30 18:02:34 -05:00