Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 02:50:09 +01:00
[CI-SKIP] Fix the NMS Imports detecting our own files
the way I handled this on my fork was using the metadata in the git "stats" output of patches, however we don't include stats in the patch files for paper so the code didn't work. Changed the code to detect our own file editions inside of NMS to a method that works without stats. So we no longer need to manually add files to this list
Dieser Commit ist enthalten in:
Ursprung
d37d04a52f
Commit
ab56ada4d2
@ -41,13 +41,7 @@ function import {
|
||||
|
||||
files=$(cat "$basedir/Spigot-Server-Patches/"* | grep "+++ b/src/main/java/net/minecraft/server/" | sort | uniq | sed 's/\+\+\+ b\/src\/main\/java\/net\/minecraft\/server\///g' | sed 's/.java//g')
|
||||
|
||||
nonnms=$(cat "$basedir/Spigot-Server-Patches/"* | grep "create mode " | grep -Po "src/main/java/net/minecraft/server/(.*?).java" | sort | uniq | sed 's/src\/main\/java\/net\/minecraft\/server\///g' | sed 's/.java//g' ;
|
||||
# TODO: Fix non nms to work for Paper, hard code these for now
|
||||
echo "KeyedObject" ;
|
||||
echo "MCUtil" ;
|
||||
echo "PaperLightingQueue"
|
||||
)
|
||||
|
||||
nonnms=$(grep "new file mode" -B 1 Spigot-Server-Patches/* | grep -v "new file mode" | grep -oE "net\/minecraft\/server\/.*.java" | grep -oE "[A-Za-z]+?.java$" --color=none | sed 's/.java//g')
|
||||
function containsElement {
|
||||
local e
|
||||
for e in "${@:2}"; do
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren