Commit Graph

2559 Commits

Author SHA1 Message Date
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
Zach Brown
c62efac3eb
Default configuration changes
Disable push based hoppers by default
Set chunk unload delay to 15s by default
Neither of these changes are retroactive for old users
2016-07-28 20:57:36 -05:00
Zach Brown
7dcb9b67ea
Make alternative falling block ground detection configurable
Workaround for GH-336
2016-07-28 20:54:48 -05:00
Zach Brown
dff26d883a
More informative vehicle moved wrongly log message 2016-07-28 19:17:26 -05:00
Zach Brown
f9f1a2e97e
Cleanup obfuscation helper comment format 2016-07-28 19:09:54 -05:00
Zach Brown
e30fab8ee6
Update upstream B/CB 2016-07-26 19:30:03 -05:00
Zach Brown
56d669ca52
Push based hoppers cleanup 2016-07-22 18:54:48 -05:00
Zach Brown
9918f90710
Update upstream CB 2016-07-22 17:24:30 -05:00
Zach Brown
4a551284a5
Fix TNTPrimed head hight calculation
Fixes GH-370
2016-07-19 18:48:08 -05:00
Zach Brown
11fabc9552
Less strict skull validation
Fixes GH-367
2016-07-18 18:07:48 -05:00
Zach
7e0446431d Merge pull request #369 from Gabscap/fix-banner
Fix-Banner Patch: Display correct time in F3
2016-07-17 17:39:32 -05:00
Gabscap
a6ef4fa064 Fix-Banner Patch: Display correct time in F3 2016-07-17 19:56:16 +02:00
Zach Brown
29e16baccb
Don't try and lookup profiles that have no UUID and no name
Closes GH-347
2016-07-16 20:19:25 -05:00
Zach Brown
c03e56be67
Remove use-hopper-check functionality that we restored
Our improved hopper checking system should provide a better benefit without
as many vanilla behavior issues.
2016-07-16 20:18:38 -05:00
Zach Brown
f1691b34c5
Update upstream B/CB/S 2016-07-15 17:36:53 -05:00
Zach Brown
d67763d7a3
Update upstream B/CB/S 2016-07-12 23:22:58 -05:00
Zach Brown
aea3ab11ab
Block sketchy head items and blocks 2016-07-10 10:45:05 -05:00
Aikar
9e229a2247 Upstream burritos, maybe tacos, and churros. 2016-07-08 00:17:25 -04:00
Zach Brown
c623550296
Update upstream B/CB/S 2016-07-07 21:06:58 -05:00