Commit Graph

5935 Commits

Author SHA1 Message Date
Zach Brown f09fed894f
Update upstream B/CB
--- work/Bukkit
Submodule work/Bukkit 6a4242cb..337955e3:
  > SPIGOT-5468: Improve Beehive TileEntity API
  > #473: Add an API for passing the heightmap to getHighestBlockAt* method

--- work/CraftBukkit
Submodule work/CraftBukkit 807a677e..708be695:
  > SPIGOT-5468: Improve Beehive TileEntity API
  > #624: Add an API for passing the heightmap to getHighestBlockAt* method
  > MC-135989, SPIGOT-5564: Don't kick players for flight while riptiding

This deprecates the Paper getHighestBlockAt HeightMap APIs now that
Bukkit has added their own. These methods will stick around long enough
for people to migrate. Their API is pretty much the same as ours,
migration should be quick and easy.
2020-02-08 18:32:48 -06:00
Zach Brown 7c1ef0b701
Add option to ignore the java version check in CB
Fixes GH-2935
2020-02-08 18:08:56 -06:00
Zach Brown 510dfd609f
[CI-SKIP] Update build badge in README to use proper job 2020-02-08 17:58:39 -06:00
Zach Brown 6aa27ec378
Rebuild patches 2020-02-06 21:07:34 -06:00
Spottedleaf 4712863375
Lag compensate eating (#2861)
When the server is lagging, players will wait longer when eating.
Change to also use a time check instead if it passes.
2020-02-06 21:06:52 -06:00
Zach Brown fa7400e567
Be more tolerant of invalid attributes 2020-02-06 19:32:49 -06:00
Shane Freeder 3dafa6a08a
Updated Upstream (CraftBukkit)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
807a677e SPIGOT-5558: Fix World#getHighestBlockAt, previously off by +1
2020-02-03 01:54:02 +00:00
Shane Freeder 77b05b9c8e
Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
6a4242cb #468: Allow delegation of certain elements to Vanilla when using a custom ChunkGenerator
c6697f90 SPIGOT-5559: Add EntityPotionEffectEvent causes for PATROL_CAPTAIN and WITHER_ROSE
9c1fa040 #467: Add method to remove a recipe by its key
3961d1aa Add nb-configuration.xml to .gitignore

CraftBukkit Changes:
d70084e5 Remove unused seed in CustomChunkGenerator
8a66d4c7 #619: Allow delegation of certain elements to Vanilla when using a custom ChunkGenerator
c2dc19d3 Craftbukkit -> CraftBukkit
ae45e092 SPIGOT-5559: Add EntityPotionEffectEvent causes for bee, raiders and wither rose
00980376 #618: Add method to remove a recipe by its key

Spigot Changes:
c574e08b Rebuild patches
13c24cc4 Rebuild patches
2020-02-02 11:53:48 +00:00
Shane Freeder 55b3a09dde
Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
d0800d0c Update checkstyle
e4e4bf70 Remove package-info from tests, breaks some IDEs
d6651bb0 No longer necessary to synchronize sync events

CraftBukkit Changes:
e82b5477 SPIGOT-5556: Some biome methods use incorrect positions
544ccdc5 Update checkstyle
512ff7a5 Print legacy load reason in debug mode
df371c1b SPIGOT-5554: Clear error message when BossBar is used for not fully joined players
18168500 Update scriptus
6bbb4e73 Clean up CraftBlockData.toString
b1e96bd5 SPIGOT-5551: BlockState.setData fails when used by legacy plugin

Spigot Changes:
b9baf717 Add space before ocean seed output
13394884 Rebuild patches
2020-02-01 15:20:54 +00:00
Shane Freeder 859f1296fe
Remove entities from per-chunk list (Fixes #2918) 2020-01-31 16:09:56 +00:00
Shane Freeder b21010e7e3
Remove chunks after calling ChunkUnloadEvent (Fixes #2919) 2020-01-30 16:57:46 +00:00
Shane Freeder 4e48785d91
Drop 0394-Fixed-MC-156852.patch (Fixes #2913) 2020-01-30 09:36:03 +00:00
Spottedleaf 01b965e0fd
Fix getChunkAtIfCachedImmediately (#2915) 2020-01-29 01:26:07 +00:00
Shane Freeder 0a897d6e6a
Rebuild patches
Because you know... That's how you commit them...
2020-01-28 19:48:56 +00:00
Shane Freeder 5792c8626a
Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
93e39ce1 Clarify documentation regarding getMaterial with legacyName = true
c3aeaea0 Improve dependency tracker
14c9d275 Add support for transitive depends in load access warning
c8afe560 SPIGOT-5526: Add EntityEnterBlockEvent
6bb6f07d SPIGOT-5548: Show error that hints towards plugins misusing reflection
ed75537d SPIGOT-5546: Fix bad depend access using wrong provider in message
4e4c0ee9 Fix buggy classloader warning triggering for all classes
89586a4c Print warning when loading classes from depends that have not been specified
d4fe9680 Fix bug where disablePlugin could remove ConfigurationSerializable classes from other plugins
85e683b7 Add additional checkstyle checks
612fd8e1 Correct max page count in BookMeta docs
fa8a9781 Correct max title length in BookMeta docs

CraftBukkit Changes:
ab13a117 SPIGOT-5550: Cancelled ProjectileLaunchEvent still plays sound for eggs
44016b1d SPIGOT-5538: Using javaw to run GUI prints input error
e653ae76 SPIGOT-5526: Call EntityEnterBlockEvent for bees trying to enter hives
6515ea49 SPIGOT-5537: Bee nests generated by growing trees near flower have no bees
d82b3149 Remove unused CraftWorld.getId method
10763a88 Change some block == AIR checks to isAir to catch CAVE_AIR

Spigot Changes:
f2c1cd15 Rebuild patches
bcd458ad Reformat patches
2020-01-28 19:43:57 +00:00
Gergely Sarkozi c9eebbb802 Fix Player#applyMending NPE (#2917) 2020-01-28 18:20:53 +00:00
Spottedleaf d16a5d8813 Performance patches prerequisite (#2802)
Prereq changes for the coming storm of performance patches.
Includes optimising incremental saving
2020-01-27 18:16:53 -06:00
BillyGalbreath 5fdafcd7a9 Fix #2906 - Bees get gravity in void - Fixes MC-167279 (#2912) 2020-01-26 23:59:43 +00:00
Shane Freeder 60d4c80854
Properly check for running tasks in EAR 2020-01-26 23:35:34 +00:00
Shane Freeder 7329e19ce5
Updated Upstream (CraftBukkit)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
e911c70f SPIGOT-5542: Cancelling EntityToggleGlideEvent doesn't stop client from gliding
2020-01-25 01:22:52 +00:00
BillyGalbreath b3a97d1446 Fix startup errors when double clicking jar (#2903) 2020-01-24 23:06:37 +00:00
Shane Freeder b51fbefc48
Revert "Fix errors on startup when double clicking jar (#2901)"
This reverts commit a0438faba9.
2020-01-24 21:30:15 +00:00
BillyGalbreath a0438faba9 Fix errors on startup when double clicking jar (#2901) 2020-01-24 19:13:59 +00:00
Max Lee e0da6d4b81 Seed based feature search (Fixes #2312) (#2852) 2020-01-24 19:07:14 +00:00
Shane Freeder 78dfb77e71
Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
e601e7aa SPIGOT-5540: Adding items to inventory causes legacy-data loading

CraftBukkit Changes:
596b0b2d SPIGOT-5514: VehicleEntityCollisionEvent triggered by passengers
2020-01-24 13:54:22 +00:00
Shane Freeder 969ef51ad2
Init legacy material data
This fixes an issue with plugins using legacy materials, spigot does
not populate the bukkit registry properly, leading to NPEs when using
outdated plugins. This patch should likely be dropped when spigot fixes
their legacy data usage....

Also rebuild patches because 10/10
2020-01-23 21:38:17 +00:00
Andrew Mollenkamp c471490985
Fix items vanishing through end portal (Resolves #2681) (#2894)
hehe
2020-01-23 15:38:47 +00:00
Shane Freeder 74b0ef392b
Updated Upstream (CraftBukkit)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
a0e88fb3 SPIGOT-5536: Material.values() causes legacy data init
2020-01-23 15:14:20 +00:00
Shane Freeder 8a0b371c68
Fix comparator behavior for EntityPhanton goal 2020-01-22 21:01:28 +00:00
Shane Freeder f11d64728f
Updated Upstream (Bukkit)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
af40a289 Deprecate ArmorStand equipment methods in favour of the standard and more complete EntityEquipment methods
2020-01-22 18:24:02 +00:00
Zach Brown 19ff55ef0d
Update upstream B/CB
--- work/Bukkit
Submodule work/Bukkit 538ceaff..d6b23768:
  > SPIGOT-5534: ItemStack copy constructor can cause legacy layer to load

--- work/CraftBukkit
Submodule work/CraftBukkit efd6cf55..a81f6ed3:
  > SPIGOT-5532: Material.values() yields an exception
2020-01-21 21:06:28 -06:00
Zach Brown 79710332e3
Update upstream CB
--- work/CraftBukkit
Submodule work/CraftBukkit 29737ccb..efd6cf55:
  > Only load legacy support data if something uses it
2020-01-21 20:12:53 -06:00
Spottedleaf 19de9af63c 1.15.2 update (#2887)
Functional GUI fix added by billygalbreath
2020-01-21 20:02:07 -06:00
Shane Freeder d4ae43fc00
Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
58d299a5 Clarify that TotalExperience (XpTotal) is not displayed anywhere
3342ab1e #460: Add Player#sendExperienceChange
acc05b40 SPIGOT-5525: saveResource saves files from server jars

CraftBukkit Changes:
5c6b0dc6 SPIGOT-5526: Call EntityChangeBlockEvent for bees triggering crop growth
b91ce119 #601: Implement Player#sendExperienceChange
661bebc6 Remove outdated build delay.
2020-01-21 15:12:47 +00:00
Shane Freeder 9c2d9a5f41
[CI-SKIP] Rebuild patches 2020-01-20 16:04:39 +00:00
Andrew Mollenkamp 86a4b75200 Fix items not falling correctly (Resolves #2835) (#2872) 2020-01-20 15:57:12 +00:00
Omer Uddin 35472de2bc Port activation range improvement patch (#2763) 2020-01-20 15:54:57 +00:00
BillyGalbreath 617f6033e7 Add effect to block break naturally (#2819) 2020-01-18 20:10:06 -06:00
Shane Freeder f63cfe000c
Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
a721c4ff Revert "SPIGOT-5515: Add basic validation against creating non-item itemstacks"
98369302 SPIGOT-5516: Correct EnchantmentTarget values
a11aad21 SPIGOT-5515: Add basic validation against creating non-item itemstacks

CraftBukkit Changes:
752cf95e SPIGOT-5510: VehicleBlockCollisionEvent returns the wrong block
ec4b2b5e SPIGOT-5516: Correct EnchantmentTarget values
2020-01-18 19:08:45 +00:00
Shane Freeder 00860e4e10
[CI-SKIP] rebuild patches 2020-01-18 17:58:05 +00:00
Callahhh 3d51966885 Prevent sync chunk loads when villagers try to find beds (#2855) 2020-01-18 17:54:33 +00:00
Spottedleaf f177f878a8 Full chunk debug on incremental watchdog (#2868) 2020-01-18 17:50:23 +00:00
Spottedleaf c2954557e7 Fix last firework in stack not having effects when dispensed - #2871 (#2876)
CB used the resulting item in the dispenser rather than the item
dispensed. The resulting item would have size == 0 and therefore
be convertered to air, hence why the effects disappeared.
2020-01-18 17:31:05 +00:00
Spottedleaf dd8b8df0ca Ensure portal search radius is used when teleporting players (#2877)
Also add the create search radius mojang recently introduced
to config
2020-01-18 17:28:32 +00:00
Mark Vainomaa 701114058c Fix dupe with Eigencraft redstone implementation (#2864) 2020-01-16 20:07:50 -06:00
Brody Beckwith 5dc6bd450e Optimize call to getFluid for explosions (#2859)
Signed-off-by: BrodyBeckwith <brody@beckwith.dev>
2020-01-15 00:16:04 +00:00
Shane Freeder 0f795c3e8a
Updated Upstream (CraftBukkit)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
01334e7d #616: Fix exception on entity portal teleport attempt
2020-01-14 21:43:50 +00:00
Shane Freeder 1d5bd44d13
Fix entity teleportation exceptions 2020-01-14 09:14:12 +00:00
Shane Freeder bd0337b7a9
Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
7dd1cfcd PortalEvent additions

CraftBukkit Changes:
e8cb2f51 SPIGOT-5252: Nether portal fixes and additions
fde78ef3 SPIGOT-5477: Server not shutting down

Spigot Changes:
037559e7 Rebuild patches
2020-01-13 22:36:41 +00:00
Spottedleaf 654a131620 Add more chunk debug to watchdog (#2851)
print chunk holder status, useful for indicating what steps the
server has gone through after loading chunks from disk

Also rebuild patches (cat...)
2020-01-12 21:06:05 +00:00