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

Update to Minecraft 1.18-pre5

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-11-22 09:00:00 +11:00
parent a852b81a69
commit 43702a9e10
700 changed files with 10286 additions and 10098 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
paper-server/nms-patches/net/minecraft/world/level/GameRules.patch
View File

@@ -3,56 +3,56 @@
@@ -118,7 +118,7 @@
}
public <T extends GameRules.GameRuleValue<T>> T get(GameRules.GameRuleKey<T> gamerules_gamerulekey) {
public <T extends GameRules.GameRuleValue<T>> T getRule(GameRules.GameRuleKey<T> gamerules_gamerulekey) {
- return (GameRules.GameRuleValue) this.rules.get(gamerules_gamerulekey);
+ return (T) this.rules.get(gamerules_gamerulekey); // CraftBukkit - decompile error
}
public NBTTagCompound a() {
public NBTTagCompound createTag() {
@@ -132,7 +132,7 @@
private void a(DynamicLike<?> dynamiclike) {
private void loadFromTag(DynamicLike<?> dynamiclike) {
this.rules.forEach((gamerules_gamerulekey, gamerules_gamerulevalue) -> {
- Optional optional = dynamiclike.get(gamerules_gamerulekey.id).asString().result();
+ Optional<String> optional = dynamiclike.get(gamerules_gamerulekey.id).asString().result(); // CraftBukkit - decompile error
Objects.requireNonNull(gamerules_gamerulevalue);
optional.ifPresent(gamerules_gamerulevalue::setValue);
optional.ifPresent(gamerules_gamerulevalue::deserialize);
@@ -152,8 +152,8 @@
}
private static <T extends GameRules.GameRuleValue<T>> void a(GameRules.GameRuleVisitor gamerules_gamerulevisitor, GameRules.GameRuleKey<?> gamerules_gamerulekey, GameRules.GameRuleDefinition<?> gamerules_gameruledefinition) {
- gamerules_gamerulevisitor.a(gamerules_gamerulekey, gamerules_gameruledefinition);
- gamerules_gameruledefinition.a(gamerules_gamerulevisitor, gamerules_gamerulekey);
+ gamerules_gamerulevisitor.a((GameRules.GameRuleKey<T>) gamerules_gamerulekey, (GameRules.GameRuleDefinition<T>) gamerules_gameruledefinition); // CraftBukkit - decompile error
+ ((GameRules.GameRuleDefinition<T>) gamerules_gameruledefinition).a(gamerules_gamerulevisitor, (GameRules.GameRuleKey<T>) gamerules_gamerulekey); // CraftBukkit - decompile error
private static <T extends GameRules.GameRuleValue<T>> void callVisitorCap(GameRules.GameRuleVisitor gamerules_gamerulevisitor, GameRules.GameRuleKey<?> gamerules_gamerulekey, GameRules.GameRuleDefinition<?> gamerules_gameruledefinition) {
- gamerules_gamerulevisitor.visit(gamerules_gamerulekey, gamerules_gameruledefinition);
- gamerules_gameruledefinition.callVisitor(gamerules_gamerulevisitor, gamerules_gamerulekey);
+ gamerules_gamerulevisitor.visit((GameRules.GameRuleKey<T>) gamerules_gamerulekey, (GameRules.GameRuleDefinition<T>) gamerules_gameruledefinition); // CraftBukkit - decompile error
+ ((GameRules.GameRuleDefinition<T>) gamerules_gameruledefinition).callVisitor(gamerules_gamerulevisitor, (GameRules.GameRuleKey<T>) gamerules_gamerulekey); // CraftBukkit - decompile error
}
public void a(GameRules gamerules, @Nullable MinecraftServer minecraftserver) {
public void assignFrom(GameRules gamerules, @Nullable MinecraftServer minecraftserver) {
@@ -245,7 +245,7 @@
}
public T getValue() {
public T createRule() {
- return (GameRules.GameRuleValue) this.constructor.apply(this);
+ return this.constructor.apply(this); // CraftBukkit - decompile error
}
public void a(GameRules.GameRuleVisitor gamerules_gamerulevisitor, GameRules.GameRuleKey<T> gamerules_gamerulekey) {
public void callVisitor(GameRules.GameRuleVisitor gamerules_gamerulevisitor, GameRules.GameRuleKey<T> gamerules_gamerulekey) {
@@ -275,7 +275,7 @@
}
- protected abstract void setValue(String s);
+ public abstract void setValue(String s); // PAIL - private->public
- protected abstract void deserialize(String s);
+ public abstract void deserialize(String s); // PAIL - private->public
public abstract String getValue();
public abstract String serialize();
@@ -341,7 +341,7 @@
}
@Override
- protected void setValue(String s) {
+ public void setValue(String s) { // PAIL - protected->public
- protected void deserialize(String s) {
+ public void deserialize(String s) { // PAIL - protected->public
this.value = Boolean.parseBoolean(s);
}
@@ -60,8 +60,8 @@
}
@Override
- protected void setValue(String s) {
+ public void setValue(String s) { // PAIL - protected->public
this.value = c(s);
- protected void deserialize(String s) {
+ public void deserialize(String s) { // PAIL - protected->public
this.value = safeParse(s);
}