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

Update to Minecraft 1.17

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-06-11 15:00:00 +10:00
parent 75faba7fde
commit b3a8254758
619 changed files with 10708 additions and 8451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,15 +1,24 @@
--- a/net/minecraft/world/level/GameRules.java
+++ b/net/minecraft/world/level/GameRules.java
@@ -113,7 +113,7 @@
@@ -118,7 +118,7 @@
}
public <T extends GameRules.GameRuleValue<T>> T get(GameRules.GameRuleKey<T> gamerules_gamerulekey) {
- return (GameRules.GameRuleValue) this.J.get(gamerules_gamerulekey);
+ return (T) this.J.get(gamerules_gamerulekey); // CraftBukkit - decompile error
- return (GameRules.GameRuleValue) this.rules.get(gamerules_gamerulekey);
+ return (T) this.rules.get(gamerules_gamerulekey); // CraftBukkit - decompile error
}
public NBTTagCompound a() {
@@ -144,8 +144,8 @@
@@ -132,7 +132,7 @@
private void a(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);
@@ -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) {
@@ -19,26 +28,17 @@
+ ((GameRules.GameRuleDefinition<T>) gamerules_gameruledefinition).a(gamerules_gamerulevisitor, (GameRules.GameRuleKey<T>) gamerules_gamerulekey); // CraftBukkit - decompile error
}
public boolean getBoolean(GameRules.GameRuleKey<GameRules.GameRuleBoolean> gamerules_gamerulekey) {
@@ -196,7 +196,7 @@
public void a(GameRules gamerules, @Nullable MinecraftServer minecraftserver) {
@@ -245,7 +245,7 @@
}
@Override
- protected void setValue(String s) {
+ public void setValue(String s) { // PAIL - protected->public
this.b = Boolean.parseBoolean(s);
public T getValue() {
- return (GameRules.GameRuleValue) this.constructor.apply(this);
+ return this.constructor.apply(this); // CraftBukkit - decompile error
}
@@ -251,7 +251,7 @@
}
@Override
- protected void setValue(String s) {
+ public void setValue(String s) { // PAIL - protected->public
this.b = c(s);
}
@@ -305,7 +305,7 @@
public void a(GameRules.GameRuleVisitor gamerules_gamerulevisitor, GameRules.GameRuleKey<T> gamerules_gamerulekey) {
@@ -275,7 +275,7 @@
}
@@ -47,12 +47,21 @@
public abstract String getValue();
@@ -339,7 +339,7 @@
@@ -341,7 +341,7 @@
}
public T getValue() {
- return (GameRules.GameRuleValue) this.b.apply(this);
+ return this.b.apply(this); // CraftBukkit - decompile error
@Override
- protected void setValue(String s) {
+ public void setValue(String s) { // PAIL - protected->public
this.value = Boolean.parseBoolean(s);
}
@@ -406,7 +406,7 @@
}
@Override
- protected void setValue(String s) {
+ public void setValue(String s) { // PAIL - protected->public
this.value = c(s);
}
public void a(GameRules.GameRuleVisitor gamerules_gamerulevisitor, GameRules.GameRuleKey<T> gamerules_gamerulekey) {