Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-11-15 04:20:04 +01:00
Code Issues Projekte Releases Wiki Aktivität

Initial prep for 1.16

Quellcode durchsuchen 
Remove patcehs we know need to go
add comment on one im not sure should be dropped

go ahead and fix patched repos to turn off gpg signing, as this
helps rebase/apply --continue commands not suck.

Go ahead and prep the pom file change
Dieser Commit ist enthalten in:
Aikar 2020-06-24 04:38:17 -04:00
Ursprung ec9fa36908
Commit a28f80090e
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 401ADFC9891FAAFE
6 geänderte Dateien mit 5 neuen und 4 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
Spigot-API-Patches/0001-POM-changes.patch
Datei anzeigen

@ -22,7 +22,7 @@ index 186405ba1914b2b384896c61770c225b50091401..9975ba9ae19f6217bec206fee247fac1
- <artifactId>spigot-api</artifactId> - <artifactId>spigot-api</artifactId>
+ <groupId>com.destroystokyo.paper</groupId> + <groupId>com.destroystokyo.paper</groupId>
+ <artifactId>paper-api</artifactId> + <artifactId>paper-api</artifactId>
<version>1.15.2-R0.1-SNAPSHOT</version> <version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
- <name>Spigot-API</name> - <name>Spigot-API</name>

4
Spigot-Server-Patches/0001-POM-Changes.patch
Datei anzeigen

@ -16,7 +16,7 @@ index 9fc92e347f24a0210a9190513e93cba3b6772557..3554314526b3f33ad02df2adfd42d451
- <artifactId>spigot</artifactId> - <artifactId>spigot</artifactId>
+ <artifactId>paper</artifactId> + <artifactId>paper</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.15.2-R0.1-SNAPSHOT</version> <version>1.16-R0.1-SNAPSHOT</version>
- <name>Spigot</name> - <name>Spigot</name>
- <url>https://www.spigotmc.org/</url> - <url>https://www.spigotmc.org/</url>
+ <name>Paper</name> + <name>Paper</name>
@ -27,7 +27,7 @@ index 9fc92e347f24a0210a9190513e93cba3b6772557..3554314526b3f33ad02df2adfd42d451
+ <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well --> + <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<api.version>unknown</api.version> <api.version>unknown</api.version>
<minecraft.version>1.15.2</minecraft.version> <minecraft.version>1.16</minecraft.version>
@@ -19,16 +18,22 @@ @@ -19,16 +18,22 @@
</properties> </properties>

2
Spigot-Server-Patches/0402-Fix-MC-161754.patch
Datei anzeigen

@ -17,7 +17,7 @@ index c95ce0124d948626732e796c386b7544e34b36c4..18e1ae7f0a4b06ec7d7400e791ac79e5
@Override @Override
public boolean canUse(EntityHuman entityhuman) { public boolean canUse(EntityHuman entityhuman) {
- return this.c.a(entityhuman) && this.d.isAlive() && this.d.g((Entity) entityhuman) < 8.0F; - return this.c.a(entityhuman) && this.d.isAlive() && this.d.g((Entity) entityhuman) < 8.0F;
+ return this.c.a(entityhuman) && (this.d.isAlive() && this.d.valid) && this.d.g((Entity) entityhuman) < 8.0F; // Paper - Fix MC-161754 + return this.c.a(entityhuman) && (this.d.isAlive() && this.d.valid) && this.d.g((Entity) entityhuman) < 8.0F; // Paper - Fix MC-161754 - evaluate we might still want this in 1.16 as im not confident mojang fixed this, and made it worse
} }
@Override @Override

0
Spigot-Server-Patches/0401-Fix-zero-tick-instant-grow-farms-MC-113809.patch → removed/1.16/0401-Fix-zero-tick-instant-grow-farms-MC-113809.patch
Datei anzeigen

0
Spigot-Server-Patches/0468-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch → removed/1.16/0468-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch
Datei anzeigen

1
scripts/applyPatches.sh
Datei anzeigen

@ -39,6 +39,7 @@ function applyPatch {
statusfile=".git/patch-apply-failed" statusfile=".git/patch-apply-failed"
rm -f "$statusfile" rm -f "$statusfile"
git config commit.gpgsign false
$gitcmd am --abort >/dev/null 2>&1 $gitcmd am --abort >/dev/null 2>&1
# Special case Windows handling because of ARG_MAX constraint # Special case Windows handling because of ARG_MAX constraint