mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 08:27:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appears to apply and compile correctly Paper Changes: 0dcce21f Merge remote-tracking branch 'origin/ver/1.16' 6ff90880 Merge branch 'ver/1.16' 81f6d51f [Auto] Updated Upstream (CraftBukkit) 2248fffc Clean up duplicated GameProfile Properties 49491f32 Fix Player Profile textures being duplicated - Fixes #3667 3fc98999 [1.15] Fix MobGoals#getAllGoals not actually returning all goals (#3671) 1d1c0561 Manually inline PooledBlockPosition#d(int, int, int) 5fc45f4d Revert recent changes around player skulls using user cache a8ffecc7 Fix NPE and uuid lookup for player skulls
This commit is contained in:
@@ -57,7 +57,7 @@ function applyPatch {
|
||||
echo "Resetting $target to $what_name..."
|
||||
git remote rm upstream > /dev/null 2>&1
|
||||
git remote add upstream "$basedir"/"$what" >/dev/null 2>&1
|
||||
git checkout ver/1.16 2>/dev/null || git checkout -b ver/1.16
|
||||
git checkout master 2>/dev/null || git checkout -b master
|
||||
git fetch upstream >/dev/null 2>&1
|
||||
git reset --hard upstream/upstream
|
||||
echo " Applying patches to $target..."
|
||||
|
||||
@@ -11,7 +11,7 @@ done
|
||||
if [[ "$1" == up* ]]; then
|
||||
(
|
||||
cd "$basedir/Paper/" || exit
|
||||
git fetch && git reset --hard origin/ver/1.16
|
||||
git fetch && git reset --hard origin/master
|
||||
cd ../
|
||||
git add Paper
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user