SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests Aktivität

Upstream update

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Bjarne Koll 2024-10-24 19:29:35 +02:00
Ursprung e7c58ce74f
Commit ff6f80cbff
13 geänderte Dateien mit 16 neuen und 16 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

4
README.md
Datei anzeigen

@ -40,7 +40,7 @@ How To (Plugin Developers)
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>1.21.2-R0.1-SNAPSHOT</version>
<version>1.21.3-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
```
@ -53,7 +53,7 @@ repositories {
}
dependencies {
compileOnly("io.papermc.paper:paper-api:1.21.2-R0.1-SNAPSHOT")
compileOnly("io.papermc.paper:paper-api:1.21.3-R0.1-SNAPSHOT")
}
java {

2
build.gradle.kts
Datei anzeigen

@ -67,7 +67,7 @@ repositories {
}
dependencies {
paramMappings("net.fabricmc:yarn:1.21.2+build.1:mergedv2")
paramMappings("net.fabricmc:yarn:1.21.3+build.1:mergedv2")
remapper("net.fabricmc:tiny-remapper:0.10.3:fat")
decompiler("org.vineflower:vineflower:1.10.1")
spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.13")

4
gradle.properties
Datei anzeigen

@ -1,6 +1,6 @@
group=io.papermc.paper
version=1.21.2-R0.1-SNAPSHOT
mcVersion=1.21.2
version=1.21.3-R0.1-SNAPSHOT
mcVersion=1.21.3
# Set to true while updating Minecraft version
updatingMinecraft=true

2
patches/api/Add-FeatureFlag-API.patch
Datei anzeigen

@ -137,7 +137,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ FeatureFlag VANILLA = create("vanilla");
/**
* <strong>AVAILABLE BETWEEN VERSIONS:</strong> 1.19.3 - 1.21.2
* <strong>AVAILABLE BETWEEN VERSIONS:</strong> 1.19.3 - 1.21.1
@@ -0,0 +0,0 @@ public interface FeatureFlag extends Keyed {
* @deprecated not available since 1.21.2
*/

2
patches/api/Convert-project-to-Gradle.patch
Datei anzeigen

@ -135,7 +135,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
-
- <groupId>org.spigotmc</groupId>
- <artifactId>spigot-api</artifactId>
- <version>1.21.2-R0.1-SNAPSHOT</version>
- <version>1.21.3-R0.1-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Spigot-API</name>

4
patches/server/Fix-equipment-slot-and-group-API.patch
Datei anzeigen

@ -38,7 +38,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ throw new IllegalArgumentException("BODY is not valid for players!");
+ // Paper end
default:
throw new IllegalArgumentException("Not implemented. This is a bug");
throw new IllegalArgumentException("Could not set slot " + slot + " - not a valid slot for PlayerInventory");
}
@@ -0,0 +0,0 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i
return java.util.Objects.requireNonNullElseGet(this.getChestplate(), () -> new ItemStack(org.bukkit.Material.AIR)); // Paper - make nonnull
@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ throw new IllegalArgumentException("BODY is not valid for players!");
+ // Paper end
default:
throw new IllegalArgumentException("Not implemented. This is a bug");
throw new IllegalArgumentException("Could not get slot " + slot + " - not a valid slot for PlayerInventory");
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644

2
patches/server/Fix-issues-with-Recipe-API.patch
Datei anzeigen

@ -24,7 +24,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
@@ -0,0 +0,0 @@ public interface CraftRecipe extends Recipe {
stack = Ingredient.of(((RecipeChoice.MaterialChoice) bukkit).getChoices().stream().map((mat) -> CraftItemType.bukkitToMinecraft(mat)));
} else if (bukkit instanceof RecipeChoice.ExactChoice) {
stack = Ingredient.ofStacks(((RecipeChoice.ExactChoice) bukkit).getChoices().stream().map((mat) -> CraftItemStack.asNMSCopy(mat)));
stack = Ingredient.ofStacks(((RecipeChoice.ExactChoice) bukkit).getChoices().stream().map((mat) -> CraftItemStack.asNMSCopy(mat)).toList());
+ // Paper start - support "empty" choices
+ } else if (bukkit == RecipeChoice.empty()) {
+ stack = Ingredient.of();

2
patches/server/Make-some-itemstacks-nonnull.patch
Datei anzeigen

@ -24,5 +24,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- return this.getHelmet();
+ return java.util.Objects.requireNonNullElseGet(this.getHelmet(), () -> new ItemStack(org.bukkit.Material.AIR)); // Paper - make nonnull
default:
throw new IllegalArgumentException("Not implemented. This is a bug");
throw new IllegalArgumentException("Could not get slot " + slot + " - not a valid slot for PlayerInventory");
}

2
patches/server/Setup-Gradle-project.patch
Datei anzeigen

@ -175,7 +175,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <groupId>org.spigotmc</groupId>
- <artifactId>spigot</artifactId>
- <packaging>jar</packaging>
- <version>1.21.2-R0.1-SNAPSHOT</version>
- <version>1.21.3-R0.1-SNAPSHOT</version>
- <name>Spigot</name>
- <url>https://www.spigotmc.org/</url>
-

2
work/BuildData

@ -1 +1 @@
Subproject commit 0ea6fcc9bc8ad9e7c729f5031123bcc69ce2b033
Subproject commit 0c5ebabcb4ce41f69a7d2319b468b6faee434038

2
work/Bukkit

@ -1 +1 @@
Subproject commit f6ac70751dbb9d2280a14b3706248987c243e313
Subproject commit 553558256cab26217919a0809cc26f7aad22995d

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 459c38af307944fbf03a472cba33c71d93287d33
Subproject commit 18b8ae18390763d48ea292435b75c1eabf5dbff7

2
work/Spigot

@ -1 +1 @@
Subproject commit a084d85da8604d468f81091f56dc81166d912931
Subproject commit 5eb8a94b2f4dfefed5c71a40f87a84c34d1c8828