core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,400 Commits 1 Branch 0 Tags 60 MiB
Commit Graph

1490 Commits

Author SHA1 Message Date
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 8827886501
Add back linking to Adventure Javadoc (#6088) 2021-07-05 20:25:23 -07:00
Jake Potrebic 8fe561162e
Fix Player#playerListName nullability annotation (#6089) 2021-07-06 03:22:11 +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
Kezz ba7ffd06e9
Implement Sound.Source.Provider (#5935) 2021-06-28 15:07:19 +02: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
Riley Park 22280c5f55
Better checking for method return TYPE_USE annotations 2021-06-21 10:08:30 -07:00
Riley Park 15e4b30e9e
Allow use of TYPE_USE annotations 2021-06-21 09:57:15 -07:00
BillyGalbreath 961b98f9cb
[ci skip] Very important bug fix :O (#5934) 2021-06-21 14:36:53 +00:00
BillyGalbreath 1cc41d01ba
Permission message upgrades (#5932) 
* Permission message upgrades

* Allow for blank lines after split

* the future is now :o
 2021-06-21 07:07:21 -07: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
Pedro Arenas 1830de58bf
Fix `EntityEquipment::setDropChance` Javadoc (#5925) 2021-06-20 22:42:42 -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
Underscore11 321ddfea3c
fix: Blank ('') `no-permission` messages shouldn't send blank lines (#5892) 2021-06-21 01:50:36 +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
Jake Potrebic 1882ec3c07
fix patch mis-order 2021-06-19 10:45:52 -07:00
MiniDigger 512e7c99ae thank you for your service, old spigot mapped patches, you will not be missed. 2021-06-19 19:30:36 +02: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
MiniDigger ad7644ce82 downgrade snakeyaml to fix issues with comments 
this was done by upstream, but got missed. Thanks @mrfloris for pointing this out.
 2021-06-18 16:34:30 +02: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
Kyle Wood 52287ea614
Simplify Multi-Release plugin jar patch 
We don't have to worry about running on Java <9 anymore.
 2021-06-16 23:18:55 -05: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 4cbb187af5
Add note on removed patch 2021-06-15 19:34:04 +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
Omer Uddin 38e4dc3050
Organize removed patches (#5836) 2021-06-14 19:54:17 -07: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
Jason Penilla 6c30949610
Use correct jetbrains annotations 2021-06-13 18:48:31 -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 b75a22c4b1 not even checkstyle can help us now 2021-06-14 01:48:04 +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
MiniDigger 123a41d132 adjust material set tag sizes 
MC added a buuuunch of stuff
 2021-06-13 20:34:25 +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 cef692bcc6 wor 2021-06-12 21:25:07 -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
Jason Penilla 672c5365f4
Write API version to pom.properties for Versioning to read 
Maven writes this metadata normally, but we don't use maven. Maybe should modify Versioning instead in the future, but this works just fine for now.
 2021-06-12 18:28:41 -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 9c2a18af92
fix: remove #isStopping check 
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
 2021-06-11 20:16:11 +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
Mariell Hoversholm 87ee3b4d67
fix: add pom changes to gradle 
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
 2021-06-11 20:06:01 +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 a207d14a0e
Rename all patches to correct numbering scheme 
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
 2021-06-11 15:46:44 +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