Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-17 12:00:07 +01:00
Fix applyPatches.sh not correctly pulling bukkit updates
Conflicts: applyPatches.sh
Dieser Commit ist enthalten in:
Ursprung
6776612919
Commit
65491ca84d
@ -40,7 +40,10 @@ function applyPatch {
|
||||
echo
|
||||
echo "Applying SpigotMC patches to CraftBukkit and Bukkit"
|
||||
echo
|
||||
applyPatch Bukkit Spigot-API origin/master && applyPatch CraftBukkit Spigot-Server origin/patched
|
||||
cd ../Bukkit
|
||||
hash=$(git rev-parse HEAD)
|
||||
git branch -f spigot "$hash"
|
||||
applyPatch Bukkit Spigot-API origin/spigot && applyPatch CraftBukkit Spigot-Server origin/patched
|
||||
echo
|
||||
echo "Applying PaperSpigot patches to Spigot-Server and Spigot-API"
|
||||
echo
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren