Commit Graph

2706 Commits

Author SHA1 Message Date
Jake Potrebic
f905057070
Prevent unintended light block manipulation (#6601) 2021-10-01 13:07:59 +02:00
thamid-gamer
ebfd70b289
Use null for null resource pack prompts (#6572) 2021-09-30 17:56:22 -07:00
Owen1212055
4a27a4a4d9
Update head rotation in missing places (#5481) 2021-09-30 17:50:00 -07:00
thamid-gamer
00322368c5
Make Levels Use Correct Spawn Settings (#6419) 2021-09-30 17:46:37 -07:00
Lexi
6703c13a8a
Preserve overstacked loot (#5943) 2021-09-30 17:39:17 -07:00
Jake Potrebic
425edfa5d7
More CommandBlock API (#5746) 2021-09-30 14:28:02 -07:00
Jason
3b2b835240
Fix click event when vanilla scoreboard name coloring is enabled (#6652) 2021-09-30 11:33:19 -07:00
Jake Potrebic
fce79051cc
Option to prevent NBT copy in smithing recipes (#6671) 2021-09-30 11:27:25 -07:00
Jason
8ee9bdd6ff
Fix stacktrace deobf where thrownProxy got initialized before rewriting (#6684) 2021-09-30 11:05:51 -07:00
booky10
2b404b0cfa
Fix nullability on Block#breakNaturally (#6651) 2021-09-30 10:42:44 -07:00
Jason
ce1e7e810a
Fix jline relocation (#6677) 2021-09-29 09:34:16 -07:00
Nassim Jahnke
3e3cea1a76
Ensure valid vehicle status (#6673) 2021-09-28 10:24:25 +02:00
Jake Potrebic
6de48dbdda
Fix player death kept items not being in same slot (#6663) 2021-09-25 12:06:37 -07:00
Gaider10
d0a2193d4a
Fix interaction pos in range check (#6654) 2021-09-24 10:02:14 +02:00
Kezz
397349e0aa
Adventure 4.9.1 (#6634)
Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
2021-09-23 14:07:44 -07:00
Jake Potrebic
1707c10395
fixes cancelling PlayerTradeEvent (#5612) 2021-09-22 21:10:35 -07:00
Jake Potrebic
f4f5a76e2a
Fix anvil inventory events (#6157) 2021-09-22 15:52:43 -07:00
Bjarne Koll
9460497d71
Apply furnace cook speed multiplier through event (#6378)
Previously the upstream FurnaceStartSmeltEvent would default to the
recipes cooking time, ignoring any modifications from the furnace speed
multiplier.
While this works correctly for upstream, paper introduces the speed
multiplier API, which allows a different cook time from the one provided
by the recipe.

This commit now passes the modified cooktime to the furnace start smelt
event explicitly, instead of allowing the event to default to the
recipes cooking time, thus ensuring that the speed modifier is
respected.

Resolves: #6376
2021-09-22 12:46:15 -07:00
Jake Potrebic
caa4780282
Add more component name methods (#6578) 2021-09-22 11:34:40 -07:00
Jake Potrebic
7ac51f9c15
Include slot when constructing the bukkit Attribute Modifiers (#6537) 2021-09-22 10:48:03 -07:00
Jake Potrebic
655cd8f638
Fix upstreams fix for composters and variable hoppers (#6563) 2021-09-22 10:40:45 -07:00
Nassim Jahnke
aad7d376a8
Fix axolotl/fish persistence
Fixes #6643
2021-09-22 13:40:13 +02:00
Jake Potrebic
9087993feb
Mark fish and axolotls from buckets as persistent (#6392) 2021-09-21 21:59:19 -07:00
Maddy Miller
f75636b55f
[ci skip] Update my name in author field (#6625) 2021-09-20 19:30:04 +10:00
cs8425
0680f4f448
fix per-player-mob-spawns cause total limit cap by Bukkit's spawn limit (#6574) 2021-09-16 17:40:34 -07:00
Jason
ce7516d853
Fix global limit display for MISC mob category (#6612) 2021-09-16 14:40:11 -07:00
PureGero
3069eaee04
Fix tick rates map being stored with upper case values instead of lower case (#6587) 2021-09-15 17:03:09 +10:00
Jason
89c648bcd7
Fix log message formatting when classes not owned by plugins use sysout (#6604) 2021-09-14 10:23:56 -07:00
Noah van der Aa
79e52a51bd
Don't log if debug logging isn't enabled. (#6603) 2021-09-14 16:44:06 +02:00
Nassim Jahnke
7a59345eb7
Hide feature seeds in Timings 2021-09-14 15:31:45 +02:00
Nassim Jahnke
810d200bb4
Improve interact distance check (#6591) 2021-09-11 22:18:44 +02:00
Nassim Jahnke
06db5d08b0
Updated Upstream (Bukkit/CraftBukkit) (#6589)
Upstream has released updates that appear 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:
44cfe143 SPIGOT-6249: Add Missing Effect Constants

CraftBukkit Changes:
14928261 SPIGOT-6249: Add Missing Effect Constants
332335e1 SPIGOT-6731: "Nag author" message in CraftServer lists one author only
6cd975d0 SPIGOT-5732, SPIGOT-6387: Overhaul Hanging entities
2021-09-11 19:27:48 +02:00
Finn Künstner
d060913a61
[ci skip] Fix typos in Paper comments (#6588)
* //Paper -> // Paper

* // Tuiniy -> // Paper
2021-09-11 12:22:51 +02:00
Jason
8a2b23a6a4
Remove method rename and fix reobf for Goal#getFlags (#6528) 2021-09-09 10:12:22 -07:00
Jason
1b383d7e9b
Fix VanillaGoals when in reobfuscated environment (#6580) 2021-09-09 09:57:16 -07:00
Spottedleaf
c3d50184eb Do not create nether portals that delete undestroyable blocks
Fixes https://github.com/PaperMC/Paper/issues/5773
2021-09-07 15:10:48 -07:00
Shane Freeder
295703efb6 Fixup enderpearl patch 2021-09-07 22:33:28 +01:00
Shane Freeder
310c718ed5 Fix CocaoDecorator causing a crash during generation (Fixes #6028) 2021-09-07 21:41:54 +01:00
Omer Uddin
04324c58b2 Disable enderpearls when they hit non-ticking chunk if disableEnderpearlExploit is enabled 2021-09-07 21:21:31 +01:00
Nassim Jahnke
5960af9d87
Updated Upstream (Bukkit/CraftBukkit) (#6568)
Upstream has released updates that appear 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:
7da4c0be SPIGOT-6729: Add Chunk.isEntitiesLoaded()

CraftBukkit Changes:
9217b523 #929: Call EntityBlockFormEvent for Wither Rose placed by dead entity
757d42ae SPIGOT-6729: Add Chunk.isEntitiesLoaded()
2021-09-06 11:26:47 +02:00
Jason
910a1ff9f7
Add '/paper mobcaps' and '/paper playermobcaps' commands (#6470)
Add commands to get the mobcaps for a world, as well as the mobcaps for
each player when per-player mob spawning is enabled.

Also has a hover text on each mob category listing what entity types are
in said category
2021-09-05 14:29:02 -07:00
Nassim Jahnke
6fa1983e9c
Use BlockPost#atY in end portal softlock fix 2021-09-03 20:14:29 +02:00
Noah van der Aa
3562558d62
Prevent softlocked end exit portal generation (#6525) 2021-09-03 20:05:01 +02:00
Nassim Jahnke
cc6fd371b2
Remove "Auto fix bad Y levels on player login" patch
Fixes #6357
Closes #6508
Closes #6358
2021-09-03 19:57:21 +02:00
Jake Potrebic
5c7da5536b
Prevent an infinite recursion error while rendering translatables (Fixes #6551) (#6555) 2021-09-03 18:01:05 +01:00
Shane Freeder
f6a1cb21c5 Do not process entity loads in CraftChunk#getEntities (Fixes #6543)
This re-introduces the issue behind #5872 but fixes #6543
The logic here is generally flawed however somewhat of a nuance,
upstream uses managedBlock which is basically needed to process
the posted entity adds, but, has the side-effect of processing any
chunk loads which has the naunce of stacking up and either causing a
massive performance hit, or can potentially lead the server to crash.

This issue is particularly noticable on paper due to the cumulative efforts
to drastically improve chunk loading speeds which means that there is much more
of a chance that we're about to eat a dirtload of chunk load callbacks, thus
making this issue much more of an issue
2021-09-03 15:55:22 +01:00
Spottedleaf
1276bd5039
Fixed layers from V2550 not being added to list (#6541)
Note from Spottedleaf:
Please note that this doesn't fix any problems using dataconverter
because dataconverter does not re-route world gen settings conversion.

Co-authored-by: Callum Seabrook <callum.seabrook@prevarinite.com>
2021-09-01 21:25:25 +00:00
Jake Potrebic
f02d3d8989
flattener should try to render custom translations (#6540) 2021-09-01 21:03:00 +00:00
Nassim Jahnke
ca708a0944
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6539)
Upstream has released updates that appear 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:
ed7bba95 SPIGOT-6547: Chunk#getEntities() doesn't return all entities immediately after chunk load
d99a585c SPIGOT-6719: Add getTileEntities() to LimitedRegion

CraftBukkit Changes:
422cec08 Rebuild patch
15f27fc7 SPIGOT-6547: Chunk#getEntities() doesn't return all entities immediately after chunk load
cbd747af SPIGOT-6719: Add getTileEntities() to LimitedRegion

Spigot Changes:
6c1c1b26 Rebuild patches
2021-09-01 14:03:36 +02:00
Nassim Jahnke
7bd7b18811
Configurable feature seeds (#6531)
Co-authored-by: Thonk 30448663+ExcessiveAmountsOfZombies@users.noreply.github.com

Also includes an option to auto-generate random seeds for all features and add them to the config.
2021-09-01 09:54:41 +00:00
Spottedleaf
a615186502
Remove the old updatingChunks and visibleChunks fields (#6535)
Just in case they cause problems again.

Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
2021-08-31 19:33:14 -07:00
Jason
2973e1c56e
Always use updatingChunks for saveAllChunks (#6534) 2021-09-01 00:53:56 +00:00
Jason
14be4180f6
Use updatingChunks for flush saving (#6533) 2021-08-31 17:23:22 -07:00
Nassim Jahnke
2cd4bcfba1
Fix distance map contains (#6530) 2021-08-31 12:47:00 +00:00
Spottedleaf
7d10cdea03
Merge tuinity (#6413)
This PR contains all of Tuinity's patches. Very notable ones are:

- Highly optimised collisions
- Optimised entity lookups by bounding box (Mojang made regressions in 1.17, this brings it back to 1.16)
- Starlight https://github.com/PaperMC/Starlight
- Rewritten dataconverter system https://github.com/PaperMC/DataConverter
- Random block ticking optimisation (wrongly dropped from Paper 1.17)
- Chunk ticking optimisations
- Anything else I've forgotten in the 60 or so patches

If you are a previous Tuinity user, your config will not migrate. You must do it yourself. The config options have simply been moved into paper.yml, so it will be an easy migration. However, please note that the chunk loading options in tuinity.yml are NOT compatible with the options in paper.yml. 

* Port tuinity, initial patchset

* Update gradle to 7.2

jmp said it fixes rebuildpatches not working for me. it fucking better

* Completely clean apply

* Remove tuinity config, add per player api patch

* Remove paper reobf mappings patch

* Properly update gradlew

* Force clean rebuild

* Mark fixups

Comments and ATs still need to be done

* grep -r "Tuinity"

* Fixup

* Ensure gameprofile lastaccess is written only under the state lock

* update URL for dataconverter

* Only clean rebuild tuinity patches

might fix merge conflicts

* Use UTF-8 for gradlew

* Clean rb patches again

* Convert block ids used as item ids

Neither the converters of pre 1.13 nor DFU handled these cases,
as by the time they were written the game at the time didn't
consider these ids valid - they would be air. Because of this,
some worlds have logspam since only DataConverter (not DFU or
legacy converters) will warn when an invalid id has been
seen.

While quite a few do need to now be considered as air, quite a lot
do not. So it makes sense to add conversion for these items, instead
of simply suppressing or ignoring the logs. I've now added id -> string conversion
for all block ids that could be used as items that existed in the game
before 1.7.10 (I have no interest in tracking down the
exact version block ids stopped working) that were on
https://minecraft-ids.grahamedgecombe.com/

Items that did not directly convert to new items will
be instead converted to air: stems, wheat crops, piston head,
tripwire wire block

* Fix LightPopulated parsing in V1466

The DFU code was checking if the number existed, not if it
didn't exist. I misread the original code.

* Always parse protochunk light sources unless it is marked as non-lit

Chunks not marked as lit will always go through the light engine,
so they should always have their block sources parsed.

* Update custom names to JSON for players

Missed this fix from CB, as it was inside
the DataFixers class.

I decided to double check all of the CB changes again:

DataFixers.java was the only area I missed, as I had inspected all
datafixer diffs and implemented them all into DataConverter. I also
checked Bootstrap.java again, and re-evaluated their changes. I had
previously done this, but determined that they were all bad.

The changes to make standing_sign block map to oak_sign block in
V1450 is bad, because that's not the item id V1450 accepts. Only
in 1.14 did oak_sign even exist, and as expected there is a converter
to rename all existing sign items/blocks.

The fix to register the portal block under id 1440 is useless, as
the flattenning logic will default to the lowest registered id - which
is the exact blockstate that CB registers into 1440. So it just
doesn't do anything.

The extra item ids in the id -> string converter are already added,
but I found this from EMC originally.

The change for the spawn egg id 23 -> Arrow is just wrong,
that id DOES correspond to TippedArrow, NOT Arrow. As
expected, the spawn egg already has a dedicated mapping for
Arrow, which is id 10 - which was Arrow's entity id.

I also ported a fix for the cooked_fished id update. This doesn't
really matter since there is already a dataconverter to fix this,
but the game didn't accept cooked_fished at the time. So I see
no harm.

* Review all converters and walkers

- Refactor V99 to have helper methods for defining entity/tile
  entity types
- Automatically namespace all ids that should be namespaced.
  While vanilla never saved non-namespaced data for things that
  are namespaced, plugins/users might have.
- Synchronised the identity ensure map in HelperBlockFlatteningV1450
- Code style consistency
- Add missing log warning in V102 for ITEM_NAME type conversion
- Use getBoolean instead of getByte
- Use ConverterAbstractEntityRename for V143 TippedArrow -> Arrow
  rename, as it will affect ENTITY_NAME type
- Always set isVillager to false in V502 for Zombie
- Register V808's converter under subversion 1 like DFU
- Register a breakpoint for V1.17.1. In the future, all final
  versions of major releases will have a breakpoint so that
  the work required to determine if a converter needs a breakpoint
  is minimal
- Validate that a dataconverter is only registered for a version
  that is registered
- ConverterFlattenTileEntity is actually ConverterFlattenEntity
  It even registered the converters under TILE_ENTITY, instead of
  ENTITY.
- Fix id comparison in V1492 STRUCTURE_FEATURE renamer
- Use ConverterAbstractStatsRename for V1510 stats renamer
  At the time I had written that class, the abstract renamer didn't
  exist.
- Ensure OwnerUUID is at least set to empty string in
  V1904 if the ocelot is converted to a cat (this is
  likely so that it retains a collar)
- Use generic read/write for Records in V1946
  Records is actually a list, not a map. So reading map was
  invalid.

* Always set light to zero when propagating decrease

This fixes an almost infinite loop where light values
would be spam queued on a very small subset on blocks.

This also likely fixes the memory issues people were
seeing.

* re-organize patches

* Apply and fix conflicts

* Revert some patches

getChunkAt retains chunks so that plugins don't spam loads
revert mc-4 fix will remain unless issues pop up

* Shuffle iterated chunks if per player is not enabled

Can help with some mob spawning stacking up at locations

* Make per player default, migrate all configs

* Adjust comments in fixups

* Rework config for player chunk loader

Old config is not compatible. Move all configs to be
under `settings` in paper.yml

The player chunk loader has been modified to
less aggressively load chunks, but to send
chunks at higher rates compared to tuinity. There are
new config entries to tune this behavior.

* Add back old constructor to CompressionEncoder/Decoder (fixes
 Tuinity #358)

* Raise chunk loading default limits

* Reduce worldgen thread workers for lower core count cpus

* Raise limits for chunk loading config

Also place it under `chunk-loading`

* Disable max chunk send rate by default

* Fix conflicts and rebuild patches

* Drop default send rate again

Appears to be still causing problems for no known reason

* Raise chunk send limits to 100 per player

While a low limit fixes ping issues for some people, most people
do not suffer from this issue and thus should not suffer from
an extremely slow load-in rate.

* Rebase part 1

Autosquash the fixups

* Move not implemented up

* Fixup mc-dev fixes

Missed this one

* Rebase per player viewdistance api into the original api patch

* Remove old light engine patch part 1

The prioritisation must be kept from it, so that part
has been rebased into the priority patch.
Part 2 will deal with rebasing all of the patches _after_

* Rebase remaining patches for old light patch removal

* Remove other mid tick patch

* Remove Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch

Replaced by `Do not copy visible chunks`

* Revert AT for Vec3i setX/Y/Z

The class is immutable. set should not be exposed

* Remove old IntegerUtil class

* Replace old CraftChunk#getEntities patch

* Remove import for SWMRNibbleArray in ChunkAccess

* Finished merge checklist

* Remove ensureTickThread impl in urgency patch

Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
2021-08-31 04:02:11 -07:00
Jason
6e9f38ea91
[ci skip] Cleanup Timings v2 diff (#6523) 2021-08-30 00:02:24 -07:00
Jason
cf27619809
Log error for invalid entity-per-chunk-save-limit configs (#6522) 2021-08-29 21:19:43 -07:00
Nassim Jahnke
be269d1cf0
Move ProtoWorld methods to LimitedRegion (#6486) 2021-08-28 13:43:26 +00:00
Jason
411a5eed18
Fix and optimize legacy world conversion (#6473)
CraftBukkit breaks legacy world conversion in three ways:
- Writes userdata to the path of the userdata folder rather than to
  the correct file inside the aforementioned folder. This causes the
  userdata folder to fail to be created as a file already exists at
  its path.
- Makes changes to how multiworld works, without modifying
  McRegionUpgrader to be aware of these changes.
- Calls methods on Bukkit before the server is initialized.

This patch fixes all of these issues, and also threads the
McRegionUpgrader to improve performance.
2021-08-27 22:07:12 -07:00
Spottedleaf
1c4f87a258
Ensure priority updates are determined by current level, not deferred level (#6507)
* Ensure priority updates are determined by current level, not deferred level

Deferral could cause an infinite loop to occur.

Also, re-add the light engine priority logic.

* Rebase

Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
2021-08-27 19:20:31 -07:00
Owen1212055
159112ef41
Add Missing Entity API: Cat (#5744) 2021-08-27 18:16:41 +00:00
Nassim Jahnke
f44d237de9
Updated Upstream (CraftBukkit) (#6504)
Upstream has released updates that appear 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:
5be41fb8 SPIGOT-6720: Fix bed explosion checks
09b99daf SPIGOT-6722: Close entity manager when unloading world
3a9561bf SPIGOT-6686: Changes in MaximumRepairCost for Anvil Rename cause inconsistency
2021-08-27 11:51:18 +02:00
Jake Potrebic
8b793ed52c
[ci skip] Remove this file that got created somehow (#6489) 2021-08-26 09:49:32 -07:00
Jason
0205b902c2
[ci skip] Cleanup diff in Async command map building (#6492) 2021-08-26 09:41:22 -07:00
Nassim Jahnke
0a6d320410
Sanitize ResourceLocation error logging (#6495) 2021-08-26 10:25:23 +00:00
Spottedleaf
e763a3dc95
Log when the async catcher is tripped (#6493)
The chunk system can swallow the exception given it's all
built with completablefuture, so ensure it is at least printed.

Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
2021-08-25 20:35:35 -07:00
Spottedleaf
ba4cf68774
Readd chunk priority patch, including many chunk system fixes from tuinity (#6488) 2021-08-26 02:16:27 +00:00
Jason
3773df24ce
Vanilla command permission fixes (fixes #6085) (#6490)
Fixes permission checks for vanilla commands which don't have a
requirement, as well as for namespaced vanilla commands.
2021-08-25 15:20:24 -07:00
Jason
b4ef78556c
Use configured no permission message in PaperCommand (#6484) 2021-08-25 13:34:15 -07:00
Nassim Jahnke
789bc79280
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6457)
Upstream has released updates that appear 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:
c9a46ebf #653: Add World#spawn with randomizeData parameter
e49c2e3a Damageable should extend ItemMeta
01ff04f4 SPIGOT-5880, SPIGOT-5567: New ChunkGenerator API
ca5b4b1a SPIGOT-6697: Deprecate generateTree with BlockChangeDelegate as it does not handle tiles

CraftBukkit Changes:
7c8bbcbe SPIGOT-6716: Preserve the order of stored enchantments of enchanted books.
18027d02 #914: Add World#spawn with randomizeData parameter
3cad0316 SPIGOT-6714: Don't fire PlayerBucketEvent when empty
8c6d60cf Fix server crash with BlockPopulator when entities are at a negative chunk border
4f6bcc84 SPIGOT-5880, SPIGOT-5567: New ChunkGenerator API
78d5b35b SPIGOT-6697: Restore generateTree with BlockChangeDelegate behaviour
15792f0d Rebuild patch
c949675e SPIGOT-6713: Cancelling EntityTransformEvent Causes Deceased Slimes To Not Despawn
a955f15c Fix issues with new ChunkGenerator API
a0a37f41 SPIGOT-6630: Replacing an enchantment on an item creates a conflict error

Spigot Changes:
b166a49b Rebuild patches
3c1fc60a SPIGOT-6693: Composters only take in one item at custom hopper speeds
2021-08-25 09:59:26 +02:00
Jake Potrebic
61a09c5102
Add BlockBreakBlockEvent (#4989) 2021-08-25 01:42:23 +00:00
Jason
ff3f449b33
Squash "Clear SyncLoadInfo" into "Add debug for sync chunk loads" and add tab completion for the clear argument (#6483) 2021-08-24 16:45:40 -07:00
Jake Potrebic
b74e691256
[ci skip] clean up diff from 1.17 update (#6462) 2021-08-24 23:30:26 +00:00
Pedro
182f56cdd5
Fix bed explosions in custom worlds (#6345) 2021-08-24 20:03:58 +00:00
Jake Potrebic
98fa136099
Fix CB lib relocation (#6454) 2021-08-22 17:22:57 +00:00
Jake Potrebic
b37fbbca3d
Add API to change EnderEye target without other nonsense (#6460) 2021-08-22 15:19:42 +00:00
Jake Potrebic
4b7fa94010
Prevent NPE when removing enchantment with no ItemMeta (#6459) 2021-08-22 15:13:51 +00:00
Jake Potrebic
cf037fbd3e
Better docs for PlayerGameModeChangeEvent (#6461) 2021-08-22 15:10:33 +00:00
Maddy Miller
49c7564283
Fix BlockPistonRetractEvent firing multiple times (#6467) 2021-08-22 23:54:55 +10:00
MiniDigger | Martin
18284cdf66
Fix Mob Goal Leak (#6394) 2021-08-22 14:19:45 +10:00
Octavia Togami
e25557464f
Replace ThreadLocal with ConcurrentHashMap in CommandSourceStack (#6325)
This object is created so often that it likely creates problems with the
ThreadLocalMap because the weak references can't be cleaned up fast
enough. This has manifest as lag seemingly caused by WorldEdit:
https://github.com/EngineHub/WorldEdit/issues/1668
2021-08-22 03:45:40 +00:00
Mariell Hoversholm
2406634ed8
Add timeout & interval to sysout catcher (#6383) 2021-08-21 17:01:42 +02:00
Bjarne Koll
5edda39cc5
Add deepslate as xray engine 2 replacement default (#6362)
Fixes: #6350
2021-08-21 14:34:58 +00:00
Noah van der Aa
0b46fb1e5a
Respect despawn rate in merge check (#6428) 2021-08-21 14:32:07 +00:00
Jake Potrebic
18d1602724
Add API to send game events (#6444) 2021-08-21 14:26:42 +00:00
petersv5
ccbb51078a
Fix entities glitching through blocks pushed by pistons (#6308)
Fixes #5189
2021-08-21 14:15:29 +00:00
Jason
59d449d880
Set AsyncAppender dispatch thread to be a daemon thread (#6424) 2021-08-18 18:47:29 +00:00
Jason
fa184f7429
Setup dev bundle publishing (#6163) 2021-08-17 17:11:04 -05:00
Shane Freeder
f2471d20b4
Do not fire PlayerBucketFillEvent when no fluid (Fixes #4611) 2021-08-17 15:43:01 +01:00
Jake Potrebic
6dfd1d9a71
Fix yaw on player spawn (#6409) 2021-08-16 14:46:25 -07:00
Noah van der Aa
934c694efd
Don't fire entitymovevent for players. (#6402) 2021-08-15 18:37:42 +01:00
Jake Potrebic
72ce684679
Fix possible divide by 0 error with cursor updates (#6398) 2021-08-14 17:44:31 +00:00
Shane Freeder
8d182e8639
Revert "Revert "Remove "Implement-Chunk-Priority-Urgency-System-for-Chunks" (Fixes #5980)""
This reverts commit 622598f1dd.
2021-08-14 15:29:22 +01:00
Shane Freeder
622598f1dd
Revert "Remove "Implement-Chunk-Priority-Urgency-System-for-Chunks" (Fixes #5980)"
This reverts commit aa52bf9e33.
2021-08-14 15:22:21 +01:00
Shane Freeder
aa52bf9e33
Remove "Implement-Chunk-Priority-Urgency-System-for-Chunks" (Fixes #5980)
Mojang made some changes to priorities in 1.17 and it seems that these changes
conflict with the changes made in this patch, which in some cases appears to
cause excessive rescheduling of tasks.

This, however, is not confirmed as such but seems to be the behavior that we're
seeing to cause this issue, if mojang has adopted the changes we suggested,
then a good chunk of this patch may be unneeded, but, this needs a much better
look than I'm currently able to do
2021-08-14 14:55:55 +01:00
Jason
565cd3306c
[ci skip] Add some helper methods to the ObfHelper util class (#6374) 2021-08-14 10:06:17 +00:00
Jason
4dd33cb8b6
[ci skip] Drop "Fix CME on adding a passenger in CreatureSpawnEvent" (#6384)
This is no longer needed as Entity#passengers is an ImmutableList as of 1.17
2021-08-14 03:01:07 -07:00
Jake Potrebic
f12a7f57e1
Clear bucket NBT after dispense (#6391) 2021-08-14 02:51:03 -07:00
Jake Potrebic
c2f47a76ae
Implement Translatable in appropriate places (#6248) 2021-08-13 21:11:12 -07:00
Jason
e9aa9ce66b
Add config migration for named entity death logging option (#6390) 2021-08-13 13:24:25 -07:00
Warrior
591cac3685
Configurable item frame map cursor interval (#6385) 2021-08-13 12:14:44 -07:00
Jake Potrebic
ce43ce8265
Make EntityUnleashEvent cancellable (#4993) 2021-08-13 11:15:43 -07:00
Jake Potrebic
e942509e73
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6379)
Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
2021-08-13 10:08:34 -07:00
Jason
80836709e7
Fix block drops position losing precision millions of blocks out (#6387) 2021-08-12 21:46:55 -07:00
Andrew Steinborn
370b60de14
Optimize indirect passenger iteration (#6366) 2021-08-12 15:55:41 -07:00
Jason
4d9b14efa4
Use AsyncAppender instead of AsyncLoggerContextSelector to keep loggging IO off main thread (#6381) 2021-08-12 10:55:20 -07:00
Jason Penilla
5c65546f5c rebase 2021-08-11 07:01:11 +02:00
Mariell Hoversholm
415f7ca165 Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear 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:
e0598aa2 SPIGOT-6692: Add sendSignChange overload with a hasGlowingText parameter

CraftBukkit Changes:
2cdc6b1e4 SPIGOT-6692: Add sendSignChange overload with a hasGlowingText parameter
2021-08-11 07:01:11 +02:00
Jake Potrebic
80650e8936
Added EntityItemDamageEvent (#4928) 2021-08-10 05:04:44 +00:00
Jason
25cd8aba9f
Config option for Piglins guarding chests (#4829) 2021-08-10 02:13:58 +00:00
Andrew Steinborn
bfb3d42b44
Optimize entity tracker passenger checks (#6361)
When a ServerEntity instance is first constructed, it uses a pre-Java 9 empty collection,
but passengers use Guava ImmutableList. When comparing the two collections via Object#equals
we miss out on an opportunity to reduce the check to little more than a reference equality
check (which is very fast).
2021-08-09 11:36:45 -07:00
Bjarne Koll
b33b63908e
Support complex components in written book builder (#6337)
The previously existing toBuilder method defined on the CraftMetaBook
would, no matter if called on a writable or written book, return a
builder targetting a writable book, in which complex components, such as
hover or click text are not allowed.

The builer hence serializes the page components using LEGACY_UXRC to
ensure only colour may be passed. While this works as intented for
writable books, the builder fails to fully support the complex
components that may be used in a written book.

This commit implemements a child class of the CraftMetaBookBuilder, the
CraftMetaBookSignedBuilder, which builds to a CraftMetaBookSigned
instance and hence serializes the pages to json.
This builder instance is automatically supplied when calling toBuilder
on a CraftMetaBookSigned instance.

Resolves: #6296
2021-08-08 15:57:20 -07:00
Jake Potrebic
f261419fd5
clone itemstack to return remaining stack (#6353) 2021-08-06 23:55:16 -07:00
Jake Potrebic
4a2f53c6e8
Add missing DamageCause for EntityDamageByBlockEvent (#6352) 2021-08-07 06:03:50 +00:00
Jake Potrebic
a178fb895e
Make hoppers respect inventory max stack size (#4838) 2021-08-07 00:35:42 +00:00
Kacper Płażewski
9b4a46f704
[ci skip] add vs code files to .gitignore (#5663) 2021-08-07 00:27:45 +00:00
Jake Potrebic
00028d57cf
call EntityDamageByBlockEvent for campfires (#6244) 2021-08-07 00:20:39 +00:00
Jake Potrebic
23e3a0ccb6
Add PlayerSetSpawnEvent (#5690) 2021-08-06 20:37:38 +00:00
thamid-gamer
9a125eecb8
Fix Incorrectly Typed Goals (#6200) 2021-08-06 17:05:53 +00:00
Noah van der Aa
c815948b6d
Fix ITEM_DROPPED stat not working properly (#6331) 2021-08-06 16:46:25 +00:00
Shane Freeder
f521a18a17
Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear 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:
75a0ee4f SPIGOT-6691: Material.LAVA_CAULDRON is not Levelled

CraftBukkit Changes:
e1c96e50 SPIGOT-6682: Blocking with shield not reset after die
97f629b6 SPIGOT-6220: Structures in the world with custom generator not work
85379258 Increase outdated build delay
f7f8dce4 SPIGOT-6552: Some inventory types reset cursor on switch
2021-08-04 16:26:56 +01:00
Prof-Bloodstone
d239eca9dd
Fix writing server.properties with wrong encoding (#6322)
Fixes #6321
2021-08-04 00:48:15 -07:00
Shane Freeder
6226208d64
Fix SysoutCatcher when plugins log before initialisation (Fixes #6323) 2021-08-04 04:04:12 +01:00
Mariell Hoversholm
9a74e70cc0
fix: boats' bounding boxes must be deflated, not inflated (#6314)
Fixes GH-6312.

Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-08-03 12:13:43 +02:00
Emilia Dreamer
aec9781f52
Fix incorrect colors in ConsoleCommandSender messages with TranslatableComponents (#6287) 2021-08-03 07:48:34 +00:00
Prof-Bloodstone
0fc6213f9c
Allow skipping writing of comments to server.properties (#6251)
Makes less git noise, as it won't update the date every single time

Use -DPaper.skipServerPropertiesComments=true flag to disable writing it
2021-08-03 00:35:02 -07:00
Noah van der Aa
6e7f9aafd6
Prevent AFK kick while watching end credits (#6239). (#6265) 2021-08-02 08:43:56 +00:00
Hannes Greule
0e978ea45e
Rewrite LogEvents to contain information about the source jar of stacktrace elements (#6142) 2021-08-02 10:32:53 +02:00
Nassim Jahnke
8c28a33d4e
Don't not shuffle visible chunks (#6283) 2021-08-02 10:00:31 +02:00
Underscore11
ed1dc272e6
Add System.out.println catcher (#6278) 2021-08-02 07:07:48 +00:00
Shane Freeder
6855505490
Fix some inconsistency issues with empty map items (#6304) 2021-08-01 16:55:25 +01:00
Shane Freeder
8bebf48495
Mark sensor and behavior timings as verbose 2021-08-01 10:22:55 +01:00
PaulBGD
81a7559b41
Correct handling of invalid maps (#6302) 2021-07-31 22:47:01 +02:00
Nassim Jahnke
7a5025d461
Fix closeInventory shenanigans (#6292) 2021-07-30 11:37:11 +02:00
Owen1212055
a67959e131
Add bee stinger API (#5962) 2021-07-29 00:36:53 +00:00
Nassim Jahnke
0e230a1bee
Updated Upstream (CraftBukkit) (#6279)
Upstream has released updates that appear 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:
6788550f SPIGOT-6678: ChunkSnapshot#isSectionEmpty() not working as intended.
3ad0fb1c #901: Fix PlayerStatisticIncrementEvent spam
2021-07-28 09:39:14 +02:00
Jason
b32a3b147c
Call EntityKnockbackByEntityEvent for RamTarget Behavior (#6273) 2021-07-26 18:41:26 +02:00
MeFisto94
efd7e5182c
Move "use-display-name-in-quit-message" to settings namespace (#6257) 2021-07-25 23:11:44 +00:00
Max Lee
2f1f1b7f0c
Add config option to specify timings url (#6256) 2021-07-25 07:10:30 +00:00
TwoLeggedCat
e905eb1986
Add fireball to default max load config (#6252) 2021-07-25 07:00:54 +00:00
Max Lee
9b0a0d896c
Add the default tick rate of the sensor to the timings (#6242) 2021-07-25 06:50:36 +00:00
Jake Potrebic
9b828509cd
Updated Upstream (CraftBukkit) (#6260) 2021-07-24 03:33:05 +01:00
Jake Potrebic
b173db6231
Fix flat bedrock (#6255) 2021-07-23 14:18:10 -07:00
Jake Potrebic
170382fe35
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6245)
Upstream has released updates that appear 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:
e7b0f8d6 #642: Add Crafting methods to API
9e58831e SPIGOT-6641: Use varargs in sendMessage
e409fe49 SPIGOT-6545: Unable to set Guardian target via API while awareness is disabled
6997c726 SPIGOT-6661: Fix missing radius from GenericGameEvent
02d03f35 SPIGOT-6369: Add ItemStack to HangingPlaceEvent

CraftBukkit Changes:
0abf420c SPIGOT-6665: Shearing a Snowman does not drop a carved pumpkin
e8e3cbcc #893: Add Crafting methods to API
879acfee Fix missing varargs from previous commit
6572b9c3 SPIGOT-6641: Use varargs in sendMessage
9e06bb2a SPIGOT-6663: Chicken Jockeys chickens don't despawn
699f2d36 SPIGOT-6545: Unable to set Guardian target via API while awareness is disabled
8ffa54ba SPIGOT-6369: Add ItemStack to HangingPlaceEvent
c851639c SPIGOT-6645: Call EntityChangeBlockEvent before PlayerHarvestBlockEvent
8d244b0b SPIGOT-3725, SPIGOT-6638, MC-136917: Properly clear tile entities before replacing

Spigot Changes:
18c71bf4 Rebuild patches
2021-07-22 18:11:56 +00:00
Jake Potrebic
3801a3951c
Add ItemRarity test (#6247) 2021-07-22 06:48:24 +02:00
Jake Potrebic
2961b2adab
Fix various mob drops being captured as death drops (#5675) 2021-07-22 02:58:24 +00:00
Jake Potrebic
b854e7e802
Drop unneeded patch (#6240) 2021-07-21 18:18:54 +00:00
Nassim Jahnke
2780e94901
Fix PaperTickList (#6241)
Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
2021-07-21 19:12:24 +02:00
Jason
44516b1d8a
[ci skip] Put mappings util in a separate class to the stacktrace deobfuscator (#6230) 2021-07-19 19:22:18 -07:00
Kyle Wood
f25facb302
Update email & name (DenWav)
Also I think I prefer my few tiny patches to be GPL.
2021-07-19 21:07:53 -05:00
zml
c225bf97d6
Fix book title and author being improperly serialized as components (#6190)
They are kept as plain strings
Additional validation has been added to prevent invalid books from being
sent to the client.
2021-07-19 23:11:06 +00:00
Nassim Jahnke
c75a8378a2
Don't expose ASM in API (#6229)
ASM was not meant to exposed to API consumers in the first place, and for the duration of time it has been exposed, it has also been relocated.

Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
2021-07-19 22:58:48 +00:00
Nassim Jahnke
fc478727d5
Use mapped names for sensor and behavior timings/config (#6228) 2021-07-19 11:07:49 +00:00
Max Lee
12942dc94b
Add rate options and timings for sensors and behaviors (#6027) 2021-07-19 11:47:33 +02:00
Max Lee
d6c81c8189
Don't apply cramming damage to players (#5903) 2021-07-19 09:31:03 +00:00
thamid-gamer
b79bc31d30
Fix MerchantOffer BuyB Only AssertionError (#6206) 2021-07-19 09:16:53 +00:00
Jason
bc127ea819
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6222)
Upstream has released updates that appear 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:
eec4aab0 SPIGOT-6657: Add getPlayer to SheepDyeWoolEvent
205213c6 SPIGOT-6656: CauldronLevelChangeEvent is not fired correctly when dripstone fills the cauldron

CraftBukkit Changes:
b8c522d5 SPIGOT-6657: Add getPlayer to SheepDyeWoolEvent
f04a77dc SPIGOT-6656: CauldronLevelChangeEvent is not fired correctly when dripstone fills the cauldron
d1dbcebc SPIGOT-6653: Canceling snow bucket placement removes snow from bucket
4f34a67b #891: Fix scheduler task ID overflow and duplication issues

Spigot Changes:
d03d7f12 BUILDTOOLS-604: Rebuild patches
2021-07-18 09:41:53 +02:00
Nassim Jahnke
8f949511b8
Revert "Fix PaperTickList" (#6216)
This commit reverts a5acf367a3
2021-07-17 21:57:00 +02:00
Nassim Jahnke
b1cdc1274c
Fix block action handling (#6213) 2021-07-17 12:46:46 +00:00
Jake Potrebic
7f89e96357
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6209) 2021-07-17 02:48:27 +01:00
Jake Potrebic
a5acf367a3
Fix PaperTickList (#6191) 2021-07-16 09:18:04 -07:00
Jake Potrebic
5a9c14bace
Fix distanceSq check on block breaking (#6195) 2021-07-16 03:01:48 +00:00
Jake Potrebic
b41b5b5c7e
Catch desynced block breaks (#6193) 2021-07-15 23:00:58 +00:00
Jake Potrebic
2e3797945c
Use cause and cancel component in PlayerGameModeChanteEvent (#6192) 2021-07-15 21:44:59 +00:00
LemonCaramel
377a60db07
Fix Stonecutter #6180 issue (#6181) 2021-07-14 08:37:22 -07:00
sulu5890
990f7daeb7
Fix incorrect message for outdated clients (#6160) 2021-07-14 02:49:38 +00:00
Shane Freeder
664eee6e13
Expand resource pack API 2021-07-12 20:42:17 +01:00
Jason
40b34615b0
[ci skip] Use commit timestamp instead of build time in manifest (#6161) 2021-07-12 06:24:48 +00:00
Jake Potrebic
70ea1b2e2b
Fix command signs (#6139) 2021-07-11 18:06:49 +00:00
Jake Potrebic
55d5c1650f
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6149)
Upstream has released updates that appear 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:
17c35d6e SPIGOT-6637: Revert "#636: Add FurnaceStartSmeltEvent"
4b27230b SPIGOT-6623: Missing API reasons for entity freezing
e1528c85 #636: Add FurnaceStartSmeltEvent

CraftBukkit Changes:
a6292cc3 SPIGOT-6637: Revert "#874: Add FurnaceStartSmeltEvent"
f4066854 SPIGOT-6579: DragonFireBall movement with setDirection jumps around a lot
9add952b SPIGOT-6623: Missing API reasons for entity freezing
2ea359f1 #874: Add FurnaceStartSmeltEvent
be8d625e SPIGOT-5560, SPIGOT-6574, SPIGOT-6632: Remove no longer needed tile entity fix

Spigot Changes:
eac3cd96 Rebuild patches
2021-07-11 09:01:29 +02:00
Jake Potrebic
a4880d832b
Fix NPE from using wrong ProtoChunk ctor (#6147) 2021-07-10 20:17:47 +00:00
Jake Potrebic
d985976b3e
Add config for mobs immune to default effects (#4835) 2021-07-10 04:49:49 +00:00
Jake Potrebic
871f30038e
fixed kick event leave message (#4766) 2021-07-09 19:03:28 +00:00
kennytv
0aa0a1d973 Updated Upstream (CraftBukkit)
Upstream has released updates that appear 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:
b5d7883a SPIGOT-6634: Override needed method
99561c21 SPIGOT-6624: Explosions do not destroy blocks out of vanilla heights in custom dimensions
2021-07-09 16:20:40 +02:00
Jake Potrebic
d770f71f41
Add PlayerArmSwingEvent (#5353) 2021-07-09 13:56:30 +00:00
Xemorr
23d887b2a6 Swapped out Vec3#distanceTo call with a Vec3#distanceToSqr call to remove calls to Math.sqrt 2021-07-09 15:35:18 +02:00
Jake Potrebic
5ff90b9381
Fix collisions during world generation (#6129) 2021-07-09 03:16:57 -07:00
Jason
20ff0b058c
[ci skip] Add a test plugin (#6133) 2021-07-09 03:04:33 -07:00
Jason
416ec98982
[ci skip] Remove extra newlines at EOF (#6127) 2021-07-08 18:40:24 -07:00
Bjarne Koll
79d7dfbbe5
Ensure shulker bounding box is updated (#6010)
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
2021-07-08 18:18:32 -07:00
Jake Potrebic
bb44da8420
Fix cancelling EntityPickupItemEvent for villagers (#6091)
Remove's Billy's fix as upstream implemented a (broken) fix and then fixed their fix
2021-07-07 11:07:38 -07:00
Nassim Jahnke
351a2c38b5
Drop no longer needed patch (#6115) 2021-07-07 19:18:05 +02:00
MD
648f6078d7
Route sign run_command click events through normal chat logic (#6109)
This patch changes sign command logic so that `run_command` click events are routed through the standard chat/command
logic used for inbound chat messages.

This fixes numerous issues related to sign click commands:
  - Signs with a `run_command` value of "/<plugin command>" would fail and show the "Unknown command" warning. This
    prevents usage of commands like `//wand` from WorldEdit in sign click events entirely and requires users to drop
    the leading slash from other plugins' commands. This patch now executes the plugin commands as would be expected,
    adding a leading slash if necessary.
  - Signs with a `run_command` value that doesn't match an existing command could fail silently. This patch causes
    these to *always* show "Unknown command" instead.
  - Plugins listening to `PlayerCommandPreprocessEvent` would not be able to intercept any command executions from
    sign click events. This patch allows plugins to intercept player commands when fired by a click event, in the same
    manner as commands executed by the player typing or clicking on a chat message.
  - Commands executed from signs would not be logged to the console. This patch fixes this.

This patch also prepends a leading slash if the `run_command` value lacks one, which matches vanilla behaviour (old
code would strip this slash away) while also ensuring `PlayerCommandPreprocessEvent#getMessage` remains consistent
with other command executions from chat (which always include the leading slash).
2021-07-07 15:12:58 +00:00
Jason
4aef0354dd
[ci skip] Use Java toolchain for run tasks (#6108) 2021-07-07 06:18:02 -07:00
Malfrador
144e5f7ac6
Add option for logging named entity deaths (#6107) 2021-07-07 06:15:17 -07:00
dfsek
b5be382d00
Add methods to ProtoWorld for working with BlockStates (#5929) 2021-07-07 10:23:16 +00:00
Jason
5059ada8d7
Move log message for named entity deaths into correct location (#6105) 2021-07-07 03:04:34 -07:00
Jason
f8d6cbdfe5
Deobfuscate stacktraces in sync load info (#6103) 2021-07-07 00:19:08 -07:00
Nassim Jahnke
56fd1a2f84
Update to Minecraft 1.17.1 (#6097) 2021-07-07 06:52:40 +00:00
Jake Potrebic
a831634d44
add Optimize Light Engine patch (#5863) 2021-07-06 04:30:39 +00:00
chickeneer
6ea4da4a68
AbstractSkeleton should extend RangedEntity (#6087)
This includes Strays and matches the mojang RangedAttackMob
2021-07-06 03:48:08 +00:00
Jason
cc063e1f09
Fix incorrect variable usage in per-player mob spawning patch (#6077) 2021-07-04 17:30:59 +01:00
Jason
2641b91350
Also deobfuscate secondary stacktraces in crash reports (#6078) 2021-07-04 03:20:11 -07:00
Jason
6fd9275867
Fix Bossbar updating (closes #6061) (#6076) 2021-07-03 16:26:13 -07:00
Jake Potrebic
0ae6dd2659
fix custom beacon ranges (#6067) 2021-07-02 19:51:49 +00:00
PaulBGD
6446e54dd9
Readd "Use getChunkIfLoadedImmediately in places" (#6047)
* Readd "Use getChunkIfLoadedImmediately in places"

* Formatting

* Fix var names
2021-07-02 20:04:29 +01:00
BillyGalbreath
882039d03e
Honor spigot.yml setting log-villager-deaths (#6057)
cat note: giggity.
2021-07-02 04:28:31 +01:00
Shane Freeder
f18dc1e3c7
Fix NPE when completing skull lookups without a real owner (Fixes #6052)
This looks like mojang introduced an NPE however it was previously being
supressed by the future used by the server, we'll just stick to the legacy
behavior of retainining the existing profile of earlier versions
2021-07-01 00:10:28 +01:00
Shane Freeder
3ddc424b89
Backport MC-229191 ore distribution changes 2021-06-30 22:11:40 +01:00
Shane Freeder
2103ad2f81
Fix NPE when using broadcast as players are joining 2021-06-29 22:21:42 +01:00
Shane Freeder
2291667661
[ci skip] patch-ception 2021-06-29 17:39:17 +01:00
Shane Freeder
333cc2e36f
Don't complete skull lookups on main thread (MC-227435) 2021-06-29 17:34:20 +01:00
Jason
1d194e5605
[ci-skip] Fix description of add-plugin command line option (#6031) 2021-06-29 02:09:02 -07:00
stonar96
59371cbd88
Optimize Anti-Xray (#5991) 2021-06-29 02:01:47 -07:00
Jason
47139376c4
Fix return value of Block#applyBoneMeal always being false (#6030) 2021-06-29 01:37:44 +00:00
Shane Freeder
3aae7ef01a
Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear 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:
214b9f14 SPIGOT-6605: Add method to access value of enforce-whitelist

CraftBukkit Changes:
b121d3b9 SPIGOT-6605: Add method to access value of enforce-whitelist
2021-06-29 01:31:35 +01:00
Shane Freeder
143f38113e
Fix players not being added to collide rule (Fixes #6024) 2021-06-28 22:16:46 +01:00
Jake Potrebic
e895403a10
Improve horrible CraftChunk#getEntities performance (#5999)
Thanks Spigot, very cool.
2021-06-28 12:53:28 +00:00
Kyle Wood
0ad55267a3
Trim whitspace off of git hash (oops) 2021-06-26 23:51:03 -05:00
Kyle Wood
e72fa4144f
Update task dependency for includeMappings so the new task isn't skipped
The new task fixJarForReobf was added after shadowJar, but since
reobfJar's input is changed in this patch, that new task needs to be
referenced instead of shadowJar.
2021-06-26 22:26:17 -05:00
Kyle Wood
7d6147d2cb
Remove now unneeded patch due to paperweight 1.1.7 2021-06-26 22:22:05 -05:00
Kyle Wood
e33ed8939f
Get short commit ref using a more proper method 2021-06-26 22:15:13 -05:00
Shane Freeder
1c77d64713
Drop codec spam fix (Fixes #5936)
having spoken to mojang about this the general issue is data which shouldn't
have been saved in the first place, so if we lose this data it's not really
an issue, bar being annoying spammy. if the spam gets on your nerves, shamefully,
all you can really do is forceUpgrade to get the conversions of the way.

Dropping as this breaks other aspects of the server and bar being spammy
seems to have no other real negative outcomes
2021-06-26 12:56:06 +01:00
Nassim Jahnke
23214fa1a7
Fix chicken jockey chicken persistence (#6005) 2021-06-26 08:54:24 +00:00
Jake Potrebic
a23eb53e13 Fix use of universe flag and forceUpgrade 2021-06-25 20:51:48 -07:00
Jason
9e07703fb7
Do not cancel chunk load on ticket level change (#5978)
New chunk system doesn't do cancellations anymore.

Co-authored-by: Spottedleaf <spottedleaf@users.noreply.github.com>
2021-06-24 10:12:47 +01:00
Shane Freeder
0be7cdbd17
Allow explosions under 0 height (Fixes #5974)
Upstream forgot to update the check here which prevents explosions
occuring under 0 height, however, vanilla already checks that we
are in bounds of the world above this, so this call is entirely
redundant.
2021-06-24 01:51:48 +01:00
Prof-Bloodstone
d50cc01b08
Make gradle take build number from env vars and add git build info (#5890)
* Make gradle take build number from env vars

* Add git information to manifest and version command/log

* trim

* Fix tests by adding NotNull annotations

* rebase

* Apply suggestions from kashike

Co-authored-by: Riley Park <riley.park@meino.net>

* Not always show branch

* Why can't everything be NotNull by default?

* Rebase

Co-authored-by: Riley Park <riley.park@meino.net>
2021-06-23 17:19:44 +00:00
stonar96
4e2f0be270
Refactor Anti-Xray and make some fixes to it (#5938) 2021-06-23 10:39:02 +02:00
Jake Potrebic
b1f6e2698e
Fix mobs not burning from summon command (#5961) 2021-06-23 10:07:59 +02:00
Jake Potrebic
28aacb44dd
Fix NPE when setting cook multiplier (#5956) 2021-06-22 19:26:03 +00:00
Shane Freeder
3c58c05c8c
Ensure disconnect for book edit is called on main 2021-06-22 20:00:53 +01:00
Jake Potrebic
b59165a2b3
remove calling expensive method (#5955) 2021-06-22 18:52:45 +00:00
Shane Freeder
b60cf52c33
Fix kick event being fired off main thread 2021-06-22 19:35:35 +01:00
Nassim Jahnke
f110140f96
Fix player collision patch cleanup (#5947) 2021-06-22 13:58:20 +00:00
Shane Freeder
a9394b8c1a
Try even harder to get an origin world and avoid NPEs (Fixes #5931) 2021-06-22 11:54:56 +01:00
Owen1212055
aed4433aca
Add more fox API (#5743) 2021-06-22 07:44:02 +00:00
Jason
ae95311131
Expand where stacktraces can be deobfuscated (#5944)
Also load the mappings from the correct location
2021-06-21 21:12:07 -07:00
BillyGalbreath
961b98f9cb
[ci skip] Very important bug fix :O (#5934) 2021-06-21 14:36:53 +00:00
Shane Freeder
47605b8e60
Try to prevent an NPE from origin data (Fixes #5905) 2021-06-21 10:04:18 +01:00
Shane Freeder
984591ce66
Fix early load perms patch (Fixes #5917) 2021-06-21 09:41:00 +01:00
Jason
10e9c5a01c
Deobfuscate stacktraces in log messages using a RewriteAppender and a custom RewritePolicy (#5926)
Also replace a couple calls to `System.err` with logger usages, as traces printed with the former do not get deobfuscated.
2021-06-21 01:09:18 -07:00
Jason
6dfe0496bd
Fix PlayerDropItemEvent using wrong item (#5924)
Co-authored-by: Spottedleaf <spottedleaf@users.noreply.github.com>
2021-06-21 05:12:04 +00:00
lexikiq
4eae2d8da3
Fix "Don't ignore result of PlayerEditBookEvent" (#5923) 2021-06-21 04:29:59 +00:00
Nassim Jahnke
17f71ac87b
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#5904)
Upstream has released updates that appear 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:
70d24eb8 SPIGOT-6587: Update documentation/error of drop chance API

CraftBukkit Changes:
470050ad SPIGOT-6587: Update documentation/error of drop chance API
1c39efa3 Fix Inventory#getViewers on the player inventory not returning the player first time their inventory is opened
d161627d Fix PrepareItemCraftEvent#isRepair
aa1fae73 SPIGOT-6586: EntityChangeBlockEvent for falling block does not cancel properly
8a04072e SPIGOT-6583: Throwing eggs doesn't make sounds

Spigot Changes:
f773da84 Remove redundant patch
cd367234 Rebuild patches
2021-06-20 21:25:59 +02:00
Shane Freeder
33d6b6fbcd
Add invalid player data to misc debug dumps 2021-06-20 15:07:00 +01:00
Spottedleaf
c89ec40619
Fix Codec log spam
Mojang did NOT add dataconverters for world gen configurations
that they CHANGED. So, the codec fails to parse old data.

This fixes two instances:
- IntProvider is new and Mojang did not account for old data.
  Thankfully, only ColumnPlace needed to be special cased.
- TreeConfiguration had changes. Thankfully, they were
  only renames for one value and thankfully defaults could
  be provided for two new values (WITHOUT changing behavior).
2021-06-20 12:59:55 +01:00
Jason
4bf6a631e7
Rename package from io.papermc.paper.world.gen to io.papermc.paper.world.generation (#5894) 2021-06-20 05:02:27 +00:00
dfsek
c4c6e26c00
Worldgen Feature API (#5727) 2021-06-19 21:48:30 -07:00
Riley Park
ce6610254f Fix GS4 querying 2021-06-19 18:27:04 -07:00
KennyTV
ac95f25f35
Fix startup delay and warning caused by oshi 2021-06-19 09:57:56 +02:00
KennyTV
0bf1be0a80
Updated Upstream (CraftBukkit)
Upstream has released updates that appear 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:
68d40318 SPIGOT-6580: Cancelling SlimeSplitEvent Causes Infinite Loop
78d93f77 SPIGOT-6576: BlockExpEvent does not show XP when breaking a furnace
2021-06-19 09:06:28 +02:00
Jake Potrebic
9f8876e92f add back optimizing ServerLevel chunk checking methods 2021-06-19 08:57:42 +02:00
Jason Penilla
309b99b12f
Save BlockEntities on main for async chunk saves
Closes #5854
2021-06-18 21:38:44 -07:00
Jason Penilla
3c5bfaddbe
Remove chat event APIs marked as deprecated for removal with 1.17 2021-06-18 15:47:40 -07:00
Kyle Wood
dad12b324b
Move package version to server project 2021-06-18 00:25:16 -05:00
Riley Park
4f14647c37
Thanks for joining us for the magic show tonight 2021-06-17 20:39:33 -07:00
djytw
c5070937e4
Fix #5856 Entity origin (#5861) 2021-06-18 04:37:23 +01:00
Riley Park
d76f8e018c
Don't include log4j 2021-06-17 18:42:17 -07:00
Jake Potrebic
c9cdc05ff1
remove more obfhelpers 2021-06-17 15:47:52 -07:00
MiniDigger
30cdf3b8b1 fix build 2021-06-17 22:25:52 +02:00
MiniDigger
13e04200c7 death to more obfhelpers 2021-06-17 22:20:03 +02:00
MiniDigger
272fb20b26 deprecate all obfhelpers 2021-06-17 21:52:26 +02:00
MiniDigger
3cdaf0b8a1 nuke a few more obfhelpers 2021-06-17 21:37:37 +02:00
MiniDigger
4104545b11 remove system property for book size limits
"It was from a different time before books were as jank as they are now. As time has gone on they've only proven to be worse and worse."
2021-06-17 21:12:40 +02:00
MiniDigger
2cbdb174b7 check if sender is a player in paper dumpitem command, closes #5858 2021-06-17 20:13:55 +02:00
Jake Potrebic
86abcdafe1
remove remaining POMs 2021-06-17 10:11:00 -07:00
KennyTV
c943a108a9
Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appear 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:
2dbec584 SPIGOT-6570: Missing InventoryType: COMPOSTER
e9ce88b9 SPIGOT-6562: Add more specific sculk sensor event

CraftBukkit Changes:
9122f5a6 #869: Fix BossBar setColor and setStyle updates
96a15d7a Incrase outdated build delay
ded19075 SPIGOT-6570: Missing InventoryType: COMPOSTER
d7ef1e91 SPIGOT-6558: Attempt to improve SkullMeta
e7a63287 SPIGOT-6562: Add more specific sculk sensor event

Spigot Changes:
101ebb63 SPIGOT-6573: Berry Bushes deal damage when not moving
2021-06-17 14:50:16 +02:00
Jason Penilla
8236add8cb
Update author on my patches 2021-06-17 02:37:24 -07:00
Jason Penilla
691cdf6f9e
Update incremental chunk saving 2021-06-17 01:37:27 -07:00
Jason Penilla
3353754726
Update Entity load/save limit per chunk 2021-06-16 21:00:32 -07:00
Kyle Wood
9bebf0b6f8
Relocate other libraries Spigot added and relocates in 1.17 2021-06-16 20:56:44 -05:00
Kyle Wood
0cd65441d1
Add a note about deleting pom.xml in first patch 2021-06-16 20:46:15 -05:00
Kyle Wood
b9402f84a9
Minor patch cleanup 2021-06-16 20:43:30 -05:00
Jason Penilla
a26d1aa427
Fix artifact ids 2021-06-16 17:27:10 -07:00
Jake Potrebic
7be3024c75
update to Adventure 4.8.1 2021-06-16 15:57:49 -07:00
Jake Potrebic
cd8f24d472
remove some more obf helpers 2021-06-16 14:22:39 -07:00
KennyTV
080d3d737a
Enable chunk load for feature search by default 2021-06-16 22:42:48 +02:00
Jake Potrebic
a6004d4f7f
fixes issue with chunk saving
fixes #5854
2021-06-16 13:35:10 -07:00
KennyTV
3d81d4e5b2
Fix entity death sounds 2021-06-16 22:17:53 +02:00
Jake Potrebic
8e187cb187
remove optimise random tick patch for now 2021-06-16 13:12:05 -07:00
KennyTV
05623c47ec
Port improve chunk status transition speed 2021-06-16 15:47:07 +02:00
KennyTV
2b3c483a98
Fix custom world height in xray patch 2021-06-16 15:14:19 +02:00
KennyTV
2b8d06aed3
Definitely readd this patch for the first time 2021-06-16 13:07:43 +02:00
KennyTV
9e1255cff9
Port chunk priority urgency patch 2021-06-16 12:32:08 +02:00
Spottedleaf
4b17540b42
Update Asynchronous chunk IO and loading for variable world height limits 2021-06-16 02:18:08 -07:00
Jason Penilla
3740db03b4 Fix comment 2021-06-16 00:33:23 -07:00
Shane Freeder
86953b2641 Modify entity origin API to store world/pos seperatly 2021-06-16 00:33:23 -07:00
Jason Penilla
d8c3fb7e47
Temporarily revert incremental chunk saving patch
Needs updating to hook into new entity storage system
2021-06-16 00:21:41 -07:00
Jason Penilla
9cfc0d5a60
Revert "Re-add Chunk Priority/Urgency System (#5829)"
This reverts commit 24b7da65ee.

Patch was updated incorrectly and needs a closer look.
2021-06-16 00:21:41 -07:00
Jake Potrebic
852ce73590
more patches added back 2021-06-15 23:26:29 -07:00
Jason Penilla
ad2a112c89
Update runDev task for Gradle 7.1 deprecations
also no longer disable watchdog by default, instead require `disableWatchdog` Gradle property to be set
2021-06-15 22:11:13 -07:00
Jake Potrebic
6f064f928e
add more patches back 2021-06-15 21:53:50 -07:00
Jake Potrebic
ea0ec8c5a0
Updated Upstream (Bukkit/CraftBukkit) & more patches
Upstream has released updates that appear 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:
e9ce88b9 SPIGOT-6562: Add more specific sculk sensor event

CraftBukkit Changes:
d7ef1e91 SPIGOT-6558: Attempt to improve SkullMeta
e7a63287 SPIGOT-6562: Add more specific sculk sensor event
2021-06-15 21:12:14 -07:00
Jason Penilla
4d40e87b33
Update sync chunk load debug patch
Had to drop some hunks modifying getEntities, as those methods were rewritten by Mojang in 1.17
2021-06-15 17:50:38 -07:00
Jason Penilla
d50b33f4da
fix StopAttackingIfTargetInvalid behavior 2021-06-15 16:55:13 -07:00
Jake Potrebic
9501e7619f
added remaining hunks from chat/title packets (#5844) 2021-06-15 16:41:38 -07:00
MiniDigger
ba2b40c603 mojang mapped vanilla goals 2021-06-16 01:24:22 +02:00
MiniDigger
f79ab295a5 one missed AT 2021-06-16 00:59:41 +02:00
MiniDigger
08fe6d3c86 Fix a few cases of the vanilla mob goals 2021-06-16 00:47:05 +02:00
MiniDigger
3fb6b93f96 AT bullshit 2021-06-16 00:24:12 +02:00
MiniDigger
90546c7c50 start adding in ATs 2021-06-15 21:44:37 +02:00
KennyTV
7480cf008a
Port Stop-copy-on-write-operations-for-updating-light-dat 2021-06-15 17:43:00 +02:00
KennyTV
eab6d9f533
Changes to xray patch 2021-06-15 16:33:39 +02:00
KennyTV
7267c01db0
Fix ChunkPacketBlockControllerAntiXray initialize 2021-06-15 16:08:48 +02:00
KennyTV
68caddbb73
Port anti x-ray patch 2021-06-15 16:08:47 +02:00
Jason Penilla
e3fea251a6
BlockPos.withinManhattan decomp fix 2021-06-15 06:55:25 -07:00
Jason Penilla
df2247b2ed
Remove sync loading of spawn chunks
Adding the tickets is sufficient
2021-06-15 03:13:30 -07:00
Jason Penilla
8291fff4ac
Updated Upstream (CraftBukkit/Spigot)
Upstream has released updates that appear 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:
f992ce60 Fix duplicate datapack reload on /reload

Spigot Changes:
9472b09d Rebuild patches
2021-06-15 01:38:57 -07:00
Jake Potrebic
3846367c2d
add back optimizing hopper searches (#5839) 2021-06-15 01:29:12 -07:00
Jason Penilla
ebbfe2749b
update Optimize Pathfinder - Remove Streams / Optimized collections 2021-06-15 00:43:03 -07:00
Jason Penilla
f267238e0e
reorder patches after merge 2021-06-14 22:49:09 -07:00
Omer Uddin
b26ba5bc8a
port some patches (#5837) 2021-06-14 22:44:37 -07:00
Jake Potrebic
8755b391fb
Add back stream patch (#5838) 2021-06-14 22:38:36 -07:00
Jason Penilla
a5251b4375
update Fix incorrect status dataconverter for pre 1.13 chunks 2021-06-14 22:12:50 -07:00
Jason Penilla
5a86fba668
final patches from remapped and unmapped
keep in mind many patches in the removed folder still need to be updated
2021-06-14 21:56:30 -07:00
Jason Penilla
f5f80a4aed
fixes 2021-06-14 21:16:18 -07:00
Jason Penilla
f6636fca9e
Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear 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:
ebb0e28d #631: Add Villager#shakeHead
751469c6 #629: Add LivingEntity#isClimbing

CraftBukkit Changes:
622cf611 SPIGOT-6555: Cannot access shield BlockStateMeta
8b2e78ec SPIGOT-6542: Fix counting players with fauxSleeping = true
f66c437a SPIGOT-6561: Add events for dripleaf tilting
6ed40004 SPIGOT-6560: Crash when falling stalactite hits player
72a2901b SPIGOT-6557: PlayerEditBookEvent#setNewBookMeta does not update meta
a07e783a #865: Implement Villager#shakeHead
3252ff18 #863: Add LivingEntity#isClimbing
77058c79 SPIGOT-6554: Worlds created with the bukkit ChunkGenerator cannot save
2021-06-14 21:02:21 -07:00
Jason Penilla
7271649af2
patches 2021-06-14 21:02:20 -07:00
Jake Potrebic
d3424f4a8a
tons of patches (#5835) 2021-06-14 22:59:31 -04:00
mechoriet
24b7da65ee
Re-add Chunk Priority/Urgency System (#5829) 2021-06-14 22:41:12 -04:00
Jason Penilla
0c732e2ef5
Put pom in correct location for Paperclip install to maven local feature 2021-06-14 18:56:02 -07:00
Jake Potrebic
09ead8b043 more patches 2021-06-14 23:42:23 +02:00
Jake Potrebic
f777faa8c1 more patches & fixes to existing patches 2021-06-14 21:18:49 +02:00
Jake Potrebic
5dce4d9178 more patches 2021-06-14 21:18:49 +02:00
Jake Potrebic
8cf470d6b1 more patches 2021-06-14 19:02:40 +02:00
Jake Potrebic
18a839d265 fix no grav bee patch for world height changes 2021-06-14 19:02:40 +02:00
Aurora
53081c6e5f
even more compile fixes 2021-06-14 17:17:08 +02:00
Aurora
b87c54f843
fix compile issues 2021-06-14 17:10:25 +02:00
Aurora
21effd6c48
even moar workkkkk 2021-06-14 17:02:03 +02:00
Josh Roy
3721b1466f need to look at this later, fails rn 2021-06-14 06:47:04 -07:00
Josh Roy
cfb17666ff even MOAR progress 2021-06-14 06:45:16 -07:00
Aurora
42091ba5f0 Merge branch 'dev/1.17' of github.com:PaperMC/Paper into dev/1.17 2021-06-14 14:04:57 +02:00
Aurora
8ca5a642ef
more work work work 2021-06-14 14:04:35 +02:00
Jason Penilla
b7cdb5d6c4
fix issue in hopper patch 2021-06-14 03:18:42 -07:00
Aurora
d2cb88db9c Merge branch 'dev/1.17' of github.com:PaperMC/Paper into dev/1.17 2021-06-14 12:13:18 +02:00
Aurora
ba3ce754a9
more work uwu 2021-06-14 12:13:08 +02:00
Jason Penilla
eddf0f40dc
decomp fixes 2021-06-14 02:15:37 -07:00
Jason Penilla
f7bc641230
Add missing getLevel implementation to Hopper Minecart, add mapping to fix reobf 2021-06-14 02:06:46 -07:00
Jake Potrebic
7fe98bd520
more patches (#5827)
* more patches

* even moar patches
2021-06-14 10:37:14 +02:00
Jake Potrebic
405ab6388e add entity debug info patch back 2021-06-14 09:38:41 +02:00
Jake Potrebic
4b2f4cbebb Add back incremental chunk saving patch 2021-06-14 09:30:41 +02:00
Jason Penilla
45c6df9648
patches 2021-06-13 23:45:29 -07:00
Jason Penilla
ba374d2485
reorder 2021-06-13 22:42:29 -07:00
mechoriet
dcbb16316d
ReAdded PreCreatureSpawnEvent from removed (#5814) 2021-06-13 22:40:21 -07:00
Jake Potrebic
9c95d0481d
Re-add xp orb merging patches (#5823) 2021-06-13 22:37:57 -07:00
Jason Penilla
3c02c90f3e
progress 2021-06-13 22:32:56 -07:00
Jason Penilla
d001eefd7e
2 patch 2021-06-13 21:29:40 -07:00
Omer Uddin
961f297963
fix exception (#5822) 2021-06-13 21:29:25 -07:00
Jason Penilla
5e62aca6c9
small fixes 2021-06-13 20:06:11 -07:00
Jason Penilla
3d7b0490c0
reorder patches after merge 2021-06-13 19:43:29 -07:00
Jason Penilla
f67dc7a35b
patches 2021-06-13 19:42:02 -07:00
Omer Uddin
3e552cc54c
work work (#5821) 2021-06-13 19:41:44 -07:00
Jake Potrebic
2a46c72164
EVEN MOOOOOAAAAAAARRRRRRR patches :) (#5820) 2021-06-13 18:06:38 -07:00
MiniDigger
9085da6e60 fix tests 2021-06-14 02:19:51 +02:00
MiniDigger
2372198eb4 use local class for movecontrol stuff to prevent reobf mapping issue 2021-06-14 01:19:51 +02:00
Jake Potrebic
f55b6e04b1 MOAR PATCHES 2021-06-14 00:06:46 +02:00
Jake Potrebic
27a8d6da9a more patches 2021-06-13 21:31:39 +02:00
Professor Bloodstone
7f15d7832f Fix recursive connection call causing StackOverflowException
This was probably caused by the rename sendPacket->send and dispatchPacket->sendPacket
2021-06-13 19:24:06 +02:00
Aurora
8af12b17c1
even more work 2021-06-13 17:17:44 +02:00
Aurora
b804730254
more work 2021-06-13 15:46:28 +02:00
KennyTV
fd645b456c
Fix compile 2021-06-13 14:54:37 +02:00
KennyTV
2bf9070a52
Move this back 2021-06-13 14:44:31 +02:00
KennyTV
5d9882a976
More more work 2021-06-13 14:43:56 +02:00
KennyTV
19da14ee00
More work 2021-06-13 14:14:18 +02:00
KennyTV
d42140148f
Work 2021-06-13 13:05:43 +02:00
Jason Penilla
76a75fc35a
fix compile 2021-06-13 01:47:24 -07:00
Jason Penilla
b8b3c40023
patch 2021-06-13 01:40:50 -07:00
Jason Penilla
41a5f14f9e
patches and patches 2021-06-13 01:27:20 -07:00
Jason Penilla
79f1d1a078
patches
fix
2021-06-12 23:53:47 -07:00
Jason Penilla
0fa2a949ae
Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appear 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:
8503c3c9 #621: Add HumanEntity#getItemInUse and Material#getSlipperiness
248deb09 #622: Add methods to check if item is the breed item for an entity
2ce691d8 Clarify Player#breakBlock only works for blocks in the same world
5dcdd48e SPIGOT-6514: Small Dripleaf block data is missing half property
cc9610b7 #619: Add Player#breakBlock()
862bc475 Fix bad merge of SPIGOT-6502 fix
989bb0c1 Downgrade SnakeYAML due to issues with comments parsing
1dff62ae Fix inverted visual fire docs

CraftBukkit Changes:
40caacc8 SPIGOT-6526: World entities are not populated when plugin onEnable is called
c9a92ad0 SPIGOT-6536: Marker position not set on spawn
20d3e57c #855: Add HumanEntity#getItemInUse and Material#getSlipperiness
d9c69b44 SPIGOT-6529: Fix BundleMeta#setItems
8bd43be5 SPIGOT-6535: PlayerGameModeChangeEvent event incorrectly reports old gamemode
4ece3ff3 #856: Add methods to check if item is the breed item for an entity
dd4bec5f Add additional validation to Player#breakBlock
bc835ae6 SPIGOT-6532: Fix Entity#setGlowing
384e116e Restore 1.16.5 behaviour of InventoryDragEvent being called even when a single item is 'dragged' to its own slot
b42e708c Fix new map colors rendering as transparent
cfe7fecf SPIGOT-6524: Inventory desync when InventoryClickEvent is cancelled
eeae1b19 SPIGOT-6522: ItemStack on cursor is always AIR
7490724d Fix missing PlayerEditBookEvent
06875f76 SPIGOT-6513: Placing ItemStack in Inventory causes InventoryAction.NOTHING
27835bde SPIGOT-6519: Fix end gateway teleports
4ac634ad SPIGOT-6515: "Un-waterlogging" throws UnsupportedOperationException in some cases
da425fa2 SPIGOT-6518: Anvils falling onto dripstone can sometimes crash server
50530da9 SPIGOT-6514: Small Dripleaf block data is missing half property
6fdecf20 #853: Implement Player#breakBlock()
4db9c49f SPIGOT-6510: Bukkit#createMap throws NullPointerException
89e2b127 SPIGOT-6517: Spider jockey crash on dripstone
cbf2f678 SPIGOT-6508: Rename conflicted getServer
74575d48 SPIGOT-6506: Fix crash with custom inventories
a3df386f Fix NPE with Entity.getNearbyEntities
d747f8ed Fix NPE with World.getNearbyEntities
4d2c7800 Fix second usage of worldGenSettings just in case
5182f923 SPIGOT-6504: Fix generating fresh worlds

Spigot Changes:
66f9d3c1 Rebuild patches
191e4971 Rebuild patches
a09c0bb6 Restore Spigot experience merging
2021-06-12 22:13:07 -07:00
Jason Penilla
52f28953be
patches 2021-06-12 22:09:48 -07:00
Jason Penilla
5e9c53b5b7
Merge remote-tracking branch 'leaf/dev/1.17' into dev/1.17 2021-06-12 21:35:43 -07:00
Spottedleaf
ca621e6280 even even even even more work 2021-06-12 21:03:02 -07:00
Jason Penilla
2a3f1fa30c
Resolve run working directory from rootProject 2021-06-12 20:35:03 -07:00
Jason Penilla
06f41a4885
Use forUseAtConfigurationTime() for run directory property 2021-06-12 20:21:59 -07:00
Jason Penilla
24e9620d14
Use mergeServiceFiles() instead of AppendingTransformer 2021-06-12 19:23:21 -07:00
Jason Penilla
75b99eb454
Add runWorkDir property for setting a custom run task working directory 2021-06-12 19:18:24 -07:00
Spottedleaf
cc19211cf9 wowe 2021-06-12 19:16:10 -07:00
Jake Potrebic
2ba2c29b2e
more patches (#5811) 2021-06-13 00:45:00 +01:00
Jake Potrebic
a968aefd32 more patches 2021-06-12 23:32:23 +02:00
Jake Potrebic
716a3139b7
more patches (#5808) 2021-06-12 20:30:37 +01:00
MiniDigger
116a6013c3 Fix this stupid bullshit v2 2021-06-12 19:13:23 +02:00
Jake Potrebic
2397b86efa
more patches (#5807) 2021-06-12 17:56:13 +01:00
Aurora
79da8f0eca
even more wooooooooooooooooooooooooork uwu 2021-06-12 17:06:20 +02:00
KennyTV
8125b3f1be
More more more work 2021-06-12 14:58:17 +02:00
KennyTV
88bc74ec42
Fix patch, fix .gitattributes file name 2021-06-12 14:09:11 +02:00
KennyTV
3c1cd3bdf2
More more work 2021-06-12 13:54:46 +02:00
KennyTV
0ec8b900ba
More work 2021-06-12 12:26:21 +02:00
Spottedleaf
d9210c3ee7 even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even
more work
2021-06-12 11:22:46 +02:00
Spottedleaf
1753b33104 even even even even even even even even even even even
even even even even even even even even even even
even even even even even even even even even even
even even even even even even even even even even
even even even even even even even even even even
even even even even even even even even even even
even even even even even even even even even even

more work
2021-06-12 11:22:46 +02:00
MiniDigger
864ef24fc0 fix profile cache mappings
let me be OP god dammit!
2021-06-12 09:30:37 +02:00
Spottedleaf
b1517fe9f2 even even even even even even even even even more changes 2021-06-12 09:26:16 +02:00
Spottedleaf
9da160169a even even even even even even even more work 2021-06-12 09:26:16 +02:00
Spottedleaf
42458fbca4 even even more progress 2021-06-12 09:26:16 +02:00
Spottedleaf
8599f95b4f even more progress 2021-06-12 09:26:16 +02:00
Spottedleaf
2920f9b9e5 some patches 2021-06-12 09:26:16 +02:00
Jake Potrebic
2dc0a31f5c
fix PlayerUseUnknownEntityEvent patch (#5800) 2021-06-12 04:37:02 +01:00
Jason Penilla
d43c31d141
patches 2021-06-11 20:07:57 -07:00
Jason Penilla
c56800c6fb
Add ASM dep to API and fix issues from title packet changes with bungee api 2021-06-11 19:25:10 -07:00
Jake Potrebic
933a189a04
more patches (#5799) 2021-06-12 03:24:43 +01:00
Jake Potrebic
650edb93ca more patches 2021-06-12 03:19:04 +02:00
Jake Potrebic
3a3831d6aa more patches 2021-06-12 03:19:04 +02:00
Jake Potrebic
1f8e76b185 rebase 2021-06-12 03:19:04 +02:00
Jake Potrebic
a9f38a8789 fix adventure patch 2021-06-12 03:19:04 +02:00
Jason Penilla
9188180d7a
Add Paper version back to manifest, add runShadow, runReobf, and runDev tasks for testing 2021-06-11 18:10:12 -07:00
MiniDigger
a22a0e56ef few fixes to make it actually run 2021-06-12 02:22:53 +02:00
Mariell Hoversholm
a79616b9cc
fix: the server compiles
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 20:33:36 +02:00
Mariell Hoversholm
088e980a80
fix: closer to compilable
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 20:26:56 +02:00
Mariell Hoversholm
d8d7c8c8aa
fix: remove empty java file
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 20:08:26 +02:00
Jake Potrebic
3f10bf1163
Update Timings patch (#5796) 2021-06-11 20:02:16 +02:00
Mariell Hoversholm
132382dca3
More remapped patches
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 17:52:05 +02:00
Mariell Hoversholm
35487dbfcc
Apply a few more patches
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 15:46:25 +02:00
Mariell Hoversholm
648fec34e4
Rename POM changes to build system changes
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 14:33:08 +02:00
Mariell Hoversholm
1eedd5991a
Remap POM changes patch
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 14:31:17 +02:00
MiniDigger
4d225813a1 Move patches around 2021-06-11 14:02:28 +02:00