SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update patches to latest 1.21.4 #1

Merged
Chaoscaot merged 242 commits from update/1.21.4 into main 2025-04-23 22:27:11 +02:00
Conversation 0 Commits 242 Files Changed 2289 +16 -7
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit de410d13ef - Show all commits

21
paper-server/patches/sources/net/minecraft/world/level/GameRules.java.patch
View File

@@ -225,12 +225,8 @@
final String id; final String id;
private final GameRules.Category category; private final GameRules.Category category;
@@ -572,10 +_,10 @@ @@ -575,7 +_,7 @@
} public static class Type<T extends GameRules.Value<T>> {
}
- public static class Type<T extends GameRules.Value<T>> {
+ public static class Type<T extends GameRules.Value<T>> implements net.minecraft.world.flag.FeatureElement { // Paper - FeatureDependant for GameRule
final Supplier<ArgumentType<?>> argument; final Supplier<ArgumentType<?>> argument;
private final Function<GameRules.Type<T>, T> constructor; private final Function<GameRules.Type<T>, T> constructor;
- final BiConsumer<MinecraftServer, T> callback; - final BiConsumer<MinecraftServer, T> callback;
@@ -247,6 +243,19 @@
GameRules.VisitorCaller<T> visitorCaller, GameRules.VisitorCaller<T> visitorCaller,
Class<T> valueClass, Class<T> valueClass,
FeatureFlagSet requiredFeatures FeatureFlagSet requiredFeatures
@@ -611,6 +_,12 @@
public FeatureFlagSet requiredFeatures() {
return this.requiredFeatures;
}
+ // Paper start - expose FeatureElement wrapper for GameRules.Type.
+ // Chosen over simply adding this to the inheritance to avoid reobf issues with spigot...
+ public net.minecraft.world.flag.FeatureElement asFeatureElement() {
+ return net.minecraft.world.level.GameRules.Type.this::requiredFeatures;
+ }
+ // Paper end - expose FeatureElement wrapper for GameRules.Type.
}
public abstract static class Value<T extends GameRules.Value<T>> {
@@ -620,16 +_,16 @@ @@ -620,16 +_,16 @@
this.type = type; this.type = type;
} }

2
paper-server/src/main/java/io/papermc/paper/world/flag/PaperFeatureFlagProviderImpl.java
View File

@@ -52,7 +52,7 @@ public class PaperFeatureFlagProviderImpl implements FeatureFlagProvider {
} else if (dependant instanceof final PotionType potionType) { } else if (dependant instanceof final PotionType potionType) {
return CraftPotionType.bukkitToMinecraft(potionType); return CraftPotionType.bukkitToMinecraft(potionType);
} else if (dependant instanceof final GameRule<?> gameRule) { } else if (dependant instanceof final GameRule<?> gameRule) {
return getGameRuleType(gameRule.getName()); return getGameRuleType(gameRule.getName()).asFeatureElement();
} else { } else {
throw new IllegalArgumentException(dependant + " is not a valid feature dependant"); throw new IllegalArgumentException(dependant + " is not a valid feature dependant");
} }