OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 23:38:25 +01:00
Code Issues Projects Releases Packages Wiki Activity
7909 commits 45 branches 0 tags 287 MiB
Commit graph

2035 commits

Author SHA1 Message Date
Malfrador
fa7bf2d3dc Add option for logging named entity deaths (#6107) 2021-07-07 15:15:17 +02:00
dfsek
6a93c5c949 Add methods to ProtoWorld for working with BlockStates (#5929) 2021-07-07 03:23:16 -07:00
Jason Penilla
0b90741c3f Move log message for named entity deaths into correct location (#6105) 2021-07-07 03:04:34 -07:00
Jason Penilla
8a664e6bbc Deobfuscate stacktraces in sync load info (#6103) 2021-07-07 00:19:08 -07:00
Nassim Jahnke
7037cd401f Update to Minecraft 1.17.1 (#6097) 2021-07-07 08:52:40 +02:00
Jake Potrebic
43f52d9c13 add Optimize Light Engine patch (#5863) 2021-07-05 21:30:39 -07:00
chickeneer
d61d127882 AbstractSkeleton should extend RangedEntity (#6087) 
This includes Strays and matches the mojang RangedAttackMob
 2021-07-05 22:48:08 -05:00
Jason Penilla
d9fde9a55a Add back linking to Adventure Javadoc (#6088) 2021-07-05 20:25:23 -07:00
Jake Potrebic
fff6b90af3 Fix Player#playerListName nullability annotation (#6089) 2021-07-05 20:22:11 -07:00
Jason Penilla
cad0a49123 Fix incorrect variable usage in per-player mob spawning patch (#6077) 2021-07-04 09:30:59 -07:00
Jason Penilla
08033a4fc0 Also deobfuscate secondary stacktraces in crash reports (#6078) 2021-07-04 03:20:11 -07:00
Jason Penilla
1d6b275814 Fix Bossbar updating (closes #6061) (#6076) 2021-07-03 16:26:13 -07:00
Jake Potrebic
42714f234c fix custom beacon ranges (#6067) 2021-07-02 12:51:49 -07:00
PaulBGD
88029f0e8a Readd "Use getChunkIfLoadedImmediately in places" (#6047) 
* Readd "Use getChunkIfLoadedImmediately in places"

* Formatting

* Fix var names
 2021-07-02 14:04:29 -05:00
BillyGalbreath
42293b52e2 Honor spigot.yml setting log-villager-deaths (#6057) 
cat note: giggity.
 2021-07-01 22:28:31 -05:00
Shane Freeder
2143a948be 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
0641643c4a Backport MC-229191 ore distribution changes 2021-06-30 22:11:40 +01:00
Shane Freeder
5a5d27f6a1 Fix NPE when using broadcast as players are joining 2021-06-29 22:21:42 +01:00
Shane Freeder
0e2c1c7288 [ci skip] patch-ception 2021-06-29 17:39:17 +01:00
Shane Freeder
73d13c8c88 Don't complete skull lookups on main thread (MC-227435) 2021-06-29 17:34:20 +01:00
Jason Penilla
d0c06257f1 [ci-skip] Fix description of add-plugin command line option (#6031) 2021-06-29 02:09:02 -07:00
stonar96
c7e9c0260f Optimize Anti-Xray (#5991) 2021-06-29 11:01:47 +02:00
Jason Penilla
85ba428029 Fix return value of Block#applyBoneMeal always being false (#6030) 2021-06-28 18:37:44 -07:00
Shane Freeder
f3e872c626 Fix players not being added to collide rule (Fixes #6024) 2021-06-28 22:16:46 +01:00
Kezz
1029e65bb2 Implement Sound.Source.Provider (#5935) 2021-06-28 14:07:19 +01:00
Jake Potrebic
cecb38e6ed Improve horrible CraftChunk#getEntities performance (#5999) 
Thanks Spigot, very cool.
 2021-06-28 05:53:28 -07:00
Kyle Wood
4c515198bb Trim whitspace off of git hash (oops) 2021-06-26 23:51:03 -05:00
Kyle Wood
16030c824f 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
0b0461e997 Remove now unneeded patch due to paperweight 1.1.7 2021-06-26 22:22:05 -05:00
Kyle Wood
99bb2c025c Get short commit ref using a more proper method 2021-06-26 22:15:13 -05:00
Shane Freeder
65c6d7f38f 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
f800d80c45 Fix chicken jockey chicken persistence (#6005) 2021-06-26 10:54:24 +02:00
Jake Potrebic
28e57942d7 Fix use of universe flag and forceUpgrade 2021-06-25 18:56:12 -07:00
Jason Penilla
254ac170de 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 02:12:47 -07:00
Shane Freeder
65a6e249ea 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:44:23 +01:00
Prof-Bloodstone
5126271b6c 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 <rileysebastianpark@gmail.com>

* Not always show branch

* Why can't everything be NotNull by default?

* Rebase

Co-authored-by: Riley Park <rileysebastianpark@gmail.com>
 2021-06-23 19:19:44 +02:00
stonar96
c00618d009 Refactor Anti-Xray and make some fixes to it (#5938) 2021-06-23 10:39:02 +02:00
Jake Potrebic
2c17a86e82 Fix mobs not burning from summon command (#5961) 2021-06-23 01:07:59 -07:00
Jake Potrebic
7c2140bc63 Fix NPE when setting cook multiplier (#5956) 2021-06-22 12:26:03 -07:00
Shane Freeder
5b8a29a0cc Ensure disconnect for book edit is called on main 2021-06-22 20:00:11 +01:00
Jake Potrebic
ce3e8e8708 remove calling expensive method (#5955) 2021-06-22 11:52:45 -07:00
Shane Freeder
4ad15af215 Fix kick event being fired off main thread 2021-06-22 19:35:35 +01:00
Nassim Jahnke
b7605a2231 Fix player collision patch cleanup (#5947) 2021-06-22 15:58:20 +02:00
Shane Freeder
1599ffc11d Try even harder to get an origin world and avoid NPEs (Fixes #5931) 2021-06-22 11:54:49 +01:00
Owen1212055
4a7d7decce Add more fox API (#5743) 2021-06-22 03:44:02 -04:00
Jason Penilla
ed04368157 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
8510a478dd Better checking for method return TYPE_USE annotations 2021-06-21 10:08:30 -07:00
Riley Park
b7b70f682f Allow use of TYPE_USE annotations 2021-06-21 09:55:17 -07:00
BillyGalbreath
83bbb318a6 [ci skip] Very important bug fix :O (#5934) 2021-06-21 09:36:53 -05:00
BillyGalbreath
5166ece434 Permission message upgrades (#5932) 
* Permission message upgrades

* Allow for blank lines after split

* the future is now :o
 2021-06-21 09:07:21 -05:00
Shane Freeder
58c3edcb08 Try to prevent an NPE from origin data (Fixes #5905) 2021-06-21 10:04:18 +01:00
Shane Freeder
1763250105 Fix early load perms patch (Fixes #5917) 2021-06-21 09:41:00 +01:00
Jason Penilla
5f20f9bf95 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
f1cf984988 Fix EntityEquipment::setDropChance Javadoc (#5925) 2021-06-21 01:42:42 -04:00
Jason Penilla
6922070800 Fix PlayerDropItemEvent using wrong item (#5924) 
Co-authored-by: Spottedleaf <spottedleaf@users.noreply.github.com>
 2021-06-20 22:12:04 -07:00
lexikiq
c10499bc4d Fix "Don't ignore result of PlayerEditBookEvent" (#5923) 2021-06-21 00:29:59 -04:00
Underscore11
fbc750341f fix: Blank ('') no-permission messages shouldn't send blank lines (#5892) 2021-06-20 18:50:36 -07:00
Nassim Jahnke
41acf2c279 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
e6193a1630 Add invalid player data to misc debug dumps 2021-06-20 15:06:37 +01:00
Spottedleaf
4bfd5dbc06 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:58:35 +01:00
Jason Penilla
c0ee8ae35e Rename package from io.papermc.paper.world.gen to io.papermc.paper.world.generation (#5894) 2021-06-19 22:02:27 -07:00
dfsek
cba64693c4 Worldgen Feature API (#5727) 2021-06-19 21:48:30 -07:00
Riley Park
892f1ec052 Fix GS4 querying 2021-06-19 18:27:04 -07:00
Nassim Jahnke
eac2ccfb3a Fix startup delay and warning caused by oshi 2021-06-19 09:57:56 +02:00
Nassim Jahnke
601c40df88 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
91e39ea5ac add back optimizing ServerLevel chunk checking methods 2021-06-17 22:51:04 -07:00
Jason Penilla
7606788417 Save BlockEntities on main for async chunk saves 
Closes #5854
 2021-06-18 21:38:44 -07:00
Jason Penilla
166760a713 Remove chat event APIs marked as deprecated for removal with 1.17 2021-06-18 15:47:40 -07:00
MiniDigger | Martin
ba7094caa9 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
c34b6734a2 Move package version to server project 2021-06-18 00:25:16 -05:00
Riley Park
c867b69e41 Thanks for joining us for the magic show tonight 2021-06-17 20:38:22 -07:00
djytw
5e9ba09e6d Fix #5856 Entity origin (#5861) 2021-06-18 03:37:23 +00:00
Riley Park
1942e47836 Don't include log4j 2021-06-17 18:42:17 -07:00
Jake Potrebic
570006ab1e remove more obfhelpers 2021-06-17 14:39:36 -07:00
MiniDigger | Martin
6c9cd70194 fix build 2021-06-17 22:25:52 +02:00
MiniDigger | Martin
4ac379cbd0 death to more obfhelpers 2021-06-17 22:20:03 +02:00
MiniDigger | Martin
62fabeca0c deprecate all obfhelpers 2021-06-17 21:52:26 +02:00
MiniDigger | Martin
a486d2eccf nuke a few more obfhelpers 2021-06-17 21:37:37 +02:00
MiniDigger | Martin
8d5fa8c53b 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 | Martin
a716afea03 check if sender is a player in paper dumpitem command, closes #5858 2021-06-17 20:13:55 +02:00
Jake Potrebic
6d848fc4bf remove remaining POMs 2021-06-17 10:11:00 -07:00
Nassim Jahnke
36b107516b 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
1ffd69b7cc Update incremental chunk saving 2021-06-17 01:37:27 -07:00
Kyle Wood
d5de9fba04 Simplify Multi-Release plugin jar patch 
We don't have to worry about running on Java <9 anymore.
 2021-06-16 23:18:18 -05:00
Jason Penilla
5eb7d40379 Update Entity load/save limit per chunk 2021-06-16 21:00:32 -07:00
Kyle Wood
3dc0a3fafc Relocate other libraries Spigot added and relocates in 1.17 2021-06-16 20:56:44 -05:00
Kyle Wood
c7a0195cdd Add a note about deleting pom.xml in first patch 2021-06-16 20:46:15 -05:00
Kyle Wood
b2cab70594 Minor patch cleanup 2021-06-16 20:43:30 -05:00
Jason Penilla
48c1ea17c3 Fix artifact ids 2021-06-16 16:23:02 -07:00
Jake Potrebic
7de25fd330 update to Adventure 4.8.1 2021-06-16 15:57:49 -07:00
Jake Potrebic
4d67d89033 remove some more obf helpers 2021-06-16 10:48:25 -07:00
Nassim Jahnke
15c337032b Enable chunk load for feature search by default 2021-06-16 22:42:48 +02:00
Jake Potrebic
06d10601a7 fixes issue with chunk saving 
fixes #5854
 2021-06-16 13:34:49 -07:00
Nassim Jahnke
79da41d557 Fix entity death sounds 2021-06-16 22:17:53 +02:00
Jake Potrebic
f2f6f697bc remove optimise random tick patch for now 2021-06-16 13:12:05 -07:00
Nassim Jahnke
a483019516 Port improve chunk status transition speed 2021-06-16 15:47:07 +02:00
Nassim Jahnke
3539c592ed Fix custom world height in xray patch 2021-06-16 15:14:19 +02:00
Nassim Jahnke
41c8d7f600 Definitely readd this patch for the first time 2021-06-16 13:07:43 +02:00
Nassim Jahnke
c922b685e0 Port chunk priority urgency patch 2021-06-16 12:14:53 +02:00
Spottedleaf
1d0a9b43ec Update Asynchronous chunk IO and loading for variable world height limits 2021-06-16 02:18:08 -07:00
Jason Penilla
53cf0f23c1 Fix comment 2021-06-16 00:29:05 -07:00
Shane Freeder
e1116fe452 Modify entity origin API to store world/pos seperatly 2021-06-16 06:36:02 +01:00
Jason Penilla
f0a6f4878d Temporarily revert incremental chunk saving patch 
Needs updating to hook into new entity storage system
 2021-06-16 00:19:23 -07:00
Jason Penilla
a222ba520c Revert "Re-add Chunk Priority/Urgency System (#5829)" 
This reverts commit 2119f06b5a.

Patch was updated incorrectly and needs a closer look.
 2021-06-15 23:46:06 -07:00
Jake Potrebic
5624ad3c68 more patches added back 2021-06-15 23:25:38 -07:00
Jason Penilla
942c015158 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:10:05 -07:00
Jake Potrebic
61236ef43b add more patches back 2021-06-15 21:53:50 -07:00
Jake Potrebic
e14e8ce3bc 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:06 -07:00
Jason Penilla
1c31ebc273 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
64c6ffb24e fix StopAttackingIfTargetInvalid behavior 2021-06-15 16:54:59 -07:00
Jake Potrebic
ca8a47f9e8 added remaining hunks from chat/title packets (#5844) 2021-06-15 16:41:38 -07:00
MiniDigger | Martin
e3fac1cbe3 mojang mapped vanilla goals 2021-06-16 01:24:22 +02:00
MiniDigger | Martin
11e98528e9 one missed AT 2021-06-16 00:59:41 +02:00
MiniDigger | Martin
952a2225df Fix a few cases of the vanilla mob goals 2021-06-16 00:47:05 +02:00
MiniDigger | Martin
a1d90ea32f AT bullshit 2021-06-16 00:24:12 +02:00
MiniDigger | Martin
2eb94202ea start adding in ATs 2021-06-15 21:44:22 +02:00
Nassim Jahnke
626ce2b5d3 Port Stop-copy-on-write-operations-for-updating-light-dat 2021-06-15 17:43:00 +02:00
Nassim Jahnke
f46fa34d91 Changes to xray patch 2021-06-15 16:33:39 +02:00
Nassim Jahnke
b0db65a34d Fix ChunkPacketBlockControllerAntiXray initialize 2021-06-15 16:07:27 +02:00
Nassim Jahnke
3cf01f9fca Port anti x-ray patch 2021-06-15 15:20:52 +02:00
Jason Penilla
aa6c0aa554 BlockPos.withinManhattan decomp fix 2021-06-15 06:55:25 -07:00
Jason Penilla
a4bbe926b2 Remove sync loading of spawn chunks 
Adding the tickets is sufficient
 2021-06-15 03:13:30 -07:00
Jason Penilla
802eb82975 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
b0fe32db5f add back optimizing hopper searches (#5839) 2021-06-15 01:29:12 -07:00
Jason Penilla
e73e1393f4 update Optimize Pathfinder - Remove Streams / Optimized collections 2021-06-15 00:43:03 -07:00
Jason Penilla
651ec26387 reorder patches after merge 2021-06-14 22:49:09 -07:00
Omer Uddin
b5d3f80d85 port some patches (#5837) 2021-06-15 01:44:37 -04:00
Jake Potrebic
c9c3e59bbe Add back stream patch (#5838) 2021-06-14 22:38:36 -07:00
Jason Penilla
e2c2547bec update Fix incorrect status dataconverter for pre 1.13 chunks 2021-06-14 22:12:50 -07:00
Jason Penilla
995348f469 final patches from remapped and unmapped 
keep in mind many patches in the removed folder still need to be updated
 2021-06-14 21:55:46 -07:00
Jason Penilla
6b738c8252 fixes 2021-06-14 21:16:18 -07:00
Jason Penilla
67663024a2 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:01:27 -07:00
Jason Penilla
d15e006a8c patches 2021-06-14 20:50:26 -07:00
Jake Potrebic
b8cf7d380e tons of patches (#5835) 2021-06-14 19:59:31 -07:00
mechoriet
2119f06b5a Re-add Chunk Priority/Urgency System (#5829) 2021-06-15 04:41:12 +02:00
Jason Penilla
fdd125c43e Put pom in correct location for Paperclip install to maven local feature 2021-06-14 18:50:13 -07:00
Jake Potrebic
efc6fa6a04 more patches 2021-06-14 12:58:32 -07:00
Jake Potrebic
1c8b088450 more patches & fixes to existing patches 2021-06-14 12:17:47 -07:00
Jake Potrebic
38bf247e27 more patches 2021-06-14 11:50:22 -07:00
Jake Potrebic
b398125ead more patches 2021-06-14 09:58:00 -07:00
Jake Potrebic
1314845ad3 fix no grav bee patch for world height changes 2021-06-14 08:19:29 -07:00
Aurora
31c62f47a5 even more compile fixes 2021-06-14 17:17:08 +02:00
Aurora
7e83323ab7 fix compile issues 2021-06-14 17:10:25 +02:00
Aurora
a84faa9d7d even moar workkkkk 2021-06-14 16:41:34 +02:00
Josh Roy
983b5e1680 need to look at this later, fails rn 2021-06-14 06:47:04 -07:00
Josh Roy
c5794c5351 even MOAR progress 2021-06-14 06:45:16 -07:00
Aurora
c5210433c1 Merge branch 'dev/1.17' of github.com:PaperMC/Paper into dev/1.17 2021-06-14 14:04:57 +02:00
Aurora
578ec8c6fe more work work work 2021-06-14 12:42:08 +02:00
Jason Penilla
8865f5811d fix issue in hopper patch 2021-06-14 03:18:42 -07:00
Aurora
b018b48e2c Merge branch 'dev/1.17' of github.com:PaperMC/Paper into dev/1.17 2021-06-14 12:13:18 +02:00
Aurora
52bc694983 more work uwu 2021-06-14 11:46:59 +02:00
Jason Penilla
eb75bb7c8d decomp fixes 2021-06-14 02:15:37 -07:00
Jason Penilla
d38930d51e Add missing getLevel implementation to Hopper Minecart, add mapping to fix reobf 2021-06-14 02:06:46 -07:00
Jake Potrebic
97f581f459 more patches (#5827) 
* more patches

* even moar patches
 2021-06-14 01:37:14 -07:00
Jake Potrebic
111c52e314 add entity debug info patch back 2021-06-13 23:41:01 -07:00
Jake Potrebic
6cb2a55e24 Add back incremental chunk saving patch 2021-06-13 22:34:40 -07:00
Jason Penilla
7007f67ebb patches 2021-06-13 23:45:29 -07:00
mechoriet
a61429bdcf ReAdded PreCreatureSpawnEvent from removed (#5814) 2021-06-14 07:40:21 +02:00
Jake Potrebic
238b049489 Re-add xp orb merging patches (#5823) 2021-06-13 22:37:57 -07:00
Jason Penilla
3390082ea7 progress 2021-06-13 22:32:56 -07:00
Jason Penilla
4fb248cd77 2 patch 2021-06-13 21:27:51 -07:00
Omer Uddin
0670cfd66f fix exception (#5822) 2021-06-14 00:29:25 -04:00
Jason Penilla
d465800774 small fixes 2021-06-13 20:06:11 -07:00
Jason Penilla
8b23cde79f reorder patches after merge 2021-06-13 19:43:29 -07:00
Jason Penilla
d6cfd79fb2 patches 2021-06-13 19:40:12 -07:00
Omer Uddin
c946bcff39 work work (#5821) 2021-06-13 22:41:44 -04:00
Jason Penilla
24cd075f4e Use correct jetbrains annotations 2021-06-13 18:48:31 -07:00
Jake Potrebic
ddb72c221d EVEN MOOOOOAAAAAAARRRRRRR patches :) (#5820) 2021-06-13 18:06:38 -07:00
MiniDigger | Martin
9a87139683 fix tests 2021-06-14 02:19:51 +02:00
MiniDigger | Martin
114713030c not even checkstyle can help us now 2021-06-14 01:48:04 +02:00
MiniDigger | Martin
865f430ea4 use local class for movecontrol stuff to prevent reobf mapping issue 2021-06-14 01:19:51 +02:00
Jake Potrebic
3ee043dc0c MOAR PATCHES 2021-06-13 15:05:18 -07:00
Jake Potrebic
7dd2ea0897 more patches 2021-06-13 12:29:58 -07:00
MiniDigger | Martin
6358589ae3 adjust material set tag sizes 
MC added a buuuunch of stuff
 2021-06-13 20:34:14 +02:00
Professor Bloodstone
06da1d1d48 Fix recursive connection call causing StackOverflowException 
This was probably caused by the rename sendPacket->send and dispatchPacket->sendPacket
 2021-06-13 18:25:59 +02:00
Aurora
713d787f98 even more work 2021-06-13 16:14:18 +02:00
Aurora
fb2577e08a more work 2021-06-13 15:46:28 +02:00
Nassim Jahnke
dfe0ef7ab1 Fix compile 2021-06-13 14:54:37 +02:00
Nassim Jahnke
7ff9e98d2a Move this back 2021-06-13 14:44:31 +02:00
Nassim Jahnke
1325ad102a More more work 2021-06-13 14:43:56 +02:00
Nassim Jahnke
8521fdc840 More work 2021-06-13 13:40:34 +02:00
Nassim Jahnke
43227a418f Work 2021-06-13 11:41:07 +02:00
Jason Penilla
bda639725b fix compile 2021-06-13 01:45:29 -07:00
Jason Penilla
21e2a4d210 patch 2021-06-13 01:40:50 -07:00
Jason Penilla
4ec60d8958 patches and patches 2021-06-13 01:26:58 -07:00
Jason Penilla
9a7acfee26 patches 
fix
 2021-06-12 23:48:25 -07:00
Jason Penilla
249afad373 patches 2021-06-12 22:09:48 -07:00
Jason Penilla
9d21369fb9 Merge remote-tracking branch 'leaf/dev/1.17' into dev/1.17 2021-06-12 21:35:43 -07:00
Spottedleaf
e42c200583 wor 2021-06-12 21:25:07 -07:00
Spottedleaf
09721118a4 even even even even more work 2021-06-12 21:03:02 -07:00
Jason Penilla
266a44e61c Resolve run working directory from rootProject 2021-06-12 20:35:03 -07:00
Jason Penilla
4b48806b39 Use forUseAtConfigurationTime() for run directory property 2021-06-12 20:21:59 -07:00
Jason Penilla
744ca73135 Use mergeServiceFiles() instead of AppendingTransformer 2021-06-12 19:23:21 -07:00
Jason Penilla
ec859f1f2f Add runWorkDir property for setting a custom run task working directory 2021-06-12 19:18:24 -07:00
Spottedleaf
6690975133 wowe 2021-06-12 19:16:10 -07:00
Jason Penilla
3a7b3b35c3 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
10882402df more patches (#5811) 2021-06-12 16:45:00 -07:00
Jake Potrebic
4423b4ba08 more patches 2021-06-12 14:31:35 -07:00
Jake Potrebic
6adb418b32 more patches (#5808) 2021-06-12 12:30:37 -07:00
MiniDigger | Martin
3dbcf242c6 Fix this stupid bullshit v2 2021-06-12 19:13:23 +02:00
Jake Potrebic
3aae52d6f5 more patches (#5807) 2021-06-12 09:56:13 -07:00
Aurora
264337e396 even more wooooooooooooooooooooooooork uwu 2021-06-12 17:06:20 +02:00
Nassim Jahnke
3a483825e0 More more more work 2021-06-12 14:58:17 +02:00
Nassim Jahnke
21c7efe18c Fix patch, fix .gitattributes file name 2021-06-12 14:09:11 +02:00
Nassim Jahnke
3f41a42781 More more work 2021-06-12 13:18:01 +02:00
Nassim Jahnke
d937034264 More work 2021-06-12 12:26:21 +02:00
Spottedleaf
6d2c131449 even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even 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 02:17:20 -07:00
Spottedleaf
1c0fdc2824 even even even even even even even even even even even 
even even even even even even even even even even
even even even even even even even even even even
even even even even even even even even even even
even even even even even even 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 02:01:04 -07:00
MiniDigger | Martin
86213ac1d2 fix profile cache mappings 
let me be OP god dammit!
 2021-06-12 09:30:37 +02:00
Spottedleaf
0891c7ab48 even even even even even even even even even more changes 2021-06-12 00:24:28 -07:00
Spottedleaf
4257a725ae even even even even even even even more work 2021-06-11 23:24:50 -07:00
Spottedleaf
4b66e6c02d even even more progress 2021-06-11 23:02:49 -07:00
Spottedleaf
c6393c4571 even more progress 2021-06-11 22:20:08 -07:00
Spottedleaf
4edc9d91ac some patches 2021-06-11 21:38:04 -07:00
Jake Potrebic
f1f57bd8e5 fix PlayerUseUnknownEntityEvent patch (#5800) 2021-06-11 20:37:02 -07:00
Jason Penilla
961d6d7dac patches 2021-06-11 20:07:57 -07:00
Jason Penilla
25eea26621 Add ASM dep to API and fix issues from title packet changes with bungee api 2021-06-11 19:23:18 -07:00
Jake Potrebic
51d9594fe8 more patches (#5799) 2021-06-11 19:24:43 -07:00
Jake Potrebic
bfc788437f more patches 2021-06-11 17:57:04 -07:00
Jake Potrebic
cf306c3a89 more patches 2021-06-11 15:37:16 -07:00
Jake Potrebic
892f7a57ec rebase 2021-06-11 13:42:57 -07:00
Jake Potrebic
469a257947 fix adventure patch 2021-06-11 12:23:46 -07:00
Jason Penilla
5db334f804 Add Paper version back to manifest, add runShadow, runReobf, and runDev tasks for testing 2021-06-11 18:10:12 -07:00
MiniDigger | Martin
ee5185e59f few fixes to make it actually run 2021-06-12 02:22:53 +02:00
Mariell Hoversholm
ceecde4a32 fix: the server compiles 
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
 2021-06-11 20:33:36 +02:00
Mariell Hoversholm
041a42e0e4 fix: closer to compilable 
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
 2021-06-11 20:26:56 +02:00
Mariell Hoversholm
725ba53b4b fix: remove #isStopping check 
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
 2021-06-11 20:16:11 +02:00
Mariell Hoversholm
5fe78fe2b1 fix: remove empty java file 
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
 2021-06-11 20:08:26 +02:00
Mariell Hoversholm
08ced2fad8 fix: add pom changes to gradle 
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
 2021-06-11 20:06:01 +02:00
Jake Potrebic
8d1e866fcd Update Timings patch (#5796) 2021-06-11 11:02:16 -07:00
Mariell Hoversholm
ee3cf8cc09 More remapped patches 
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
 2021-06-11 17:52:05 +02:00
Mariell Hoversholm
66b67abbef Apply a few more patches 
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
 2021-06-11 15:46:25 +02:00
Mariell Hoversholm
aafaccad78 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
656297e209 Remap POM changes patch 
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
 2021-06-11 14:31:17 +02:00
MiniDigger | Martin
95d25d98e8 Move patches around 2021-06-11 14:02:28 +02:00