Commit graph

5930 commits

Author SHA1 Message Date
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
Kyle Wood
1b3946a0c5 Bump paerweight to 1.1.7 2021-06-26 22:11:45 -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
Shane Freeder
b3cf50a134 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:
f81f4994 SPIGOT-6594: NPE at Bukkit.getServer().getGenerateStructures()
295ab080 #872: SculkSensor accesses underlying TileEntity instead of snapshot for vibration frequency.
2021-06-24 01:39:30 +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
Jason Penilla
5298e2045a Hotfix for some of the reobf issues tracked in Paperweight issue 24 (#5965) 2021-06-22 22:45:45 -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
4cc6f5ca37 Updated Upstream (Bukkit/CraftBukkit) (#5952) 2021-06-22 19:33:51 +02: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
Prof-Bloodstone
bf3dcf3aa0 [ci skip] Performance boost! (#5942)
Make paper version required in the issue templates
2021-06-22 00:18:07 +02: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
Jason Penilla
88cd18de34 Set UTF-8 encoding for Javadoc and ProcessResources (#5937) 2021-06-21 08:27:46 -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
Kyle Wood
2107b78f00 Update paperweight to 1.1.6 2021-06-20 16:22:20 -05: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
Aurora
206649036d [CI-SKIP] Add JetBrains, thank you! (#5813) 2021-06-20 14:29:09 +02: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
MiniDigger | Martin
0940693f5d add some more reobf mappings to fix tardis and terraform 2021-06-20 11:50:36 +02:00
Kyle Wood
c1ad95f308 Add comment describing why reobf patch exists 2021-06-20 03:19:51 -05:00
Kyle Wood
b7a3b1faa0 Bump paperweight to 1.1.5 with support for patching reobf mappings 2021-06-20 02:47:14 -05:00
Kyle Wood
2dd2442b56 Merge library and mcdev imports files, bump paperweight 2021-06-20 01:59:07 -05:00
Kyle Wood
9d06e80357 Bump paperweight to 1.1.3 and paperclip to 2.0.1 2021-06-20 00:10:23 -05: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