diff options
| author | Jake Potrebic <[email protected]> | 2022-03-16 08:57:51 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-03-16 16:57:51 +0100 |
| commit | 1c5f8b0fcecd4352d7a9ec80bee97b322ba8c8e4 (patch) | |
| tree | fa361ebefe1707287dca962e17d82ffe0ef0469d /scripts | |
| parent | f35a0ceb93b726c89539ee01d6b2819692e4feec (diff) | |
| download | Paper-1c5f8b0fcecd4352d7a9ec80bee97b322ba8c8e4.tar.gz Paper-1c5f8b0fcecd4352d7a9ec80bee97b322ba8c8e4.zip | |
Updated Upstream (Bukkit/CraftBukkit) (#7604)
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:
33a2b476 PR-734: Make PlayerInventory#getItem Nullable
CraftBukkit Changes:
953d3ddc SPIGOT-3034: PlayerKickEvent.setLeaveMessage(String) doesn't actually do anything
2c47af0c SPIGOT-6963: CraftMetaBlockState#getBlockState applied TileEntity ids without the minecraft namespace prefix.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/upstreamCommit.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/upstreamCommit.sh b/scripts/upstreamCommit.sh index d806055bdc..fbf791c34e 100755 --- a/scripts/upstreamCommit.sh +++ b/scripts/upstreamCommit.sh @@ -5,7 +5,7 @@ PS1="$" function changelog() { base=$(git ls-tree HEAD $1 | cut -d' ' -f3 | cut -f1) - cd $1 && git log --oneline ${base}...HEAD | sed 's/\(^[0-9a-f]\{8,\}\s\|Revert\s"\)#\([0-9]\+\)/\1PR-\2/' + cd $1 && git log --oneline ${base}...HEAD | sed -E 's/(^[0-9a-f]{8,} |Revert ")#([0-9]+)/\1PR-\2/' } bukkit=$(changelog work/Bukkit) cb=$(changelog work/CraftBukkit) |