mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-31 04:13:51 -07:00
Update to Minecraft 1.16.1
This commit is contained in:
@@ -1,56 +1,58 @@
|
||||
--- a/net/minecraft/server/GameRules.java
|
||||
+++ b/net/minecraft/server/GameRules.java
|
||||
@@ -94,7 +94,7 @@
|
||||
@@ -106,7 +106,7 @@
|
||||
}
|
||||
|
||||
public <T extends GameRules.GameRuleValue<T>> T get(GameRules.GameRuleKey<T> gamerules_gamerulekey) {
|
||||
- return (GameRules.GameRuleValue) this.H.get(gamerules_gamerulekey);
|
||||
+ return (T) this.H.get(gamerules_gamerulekey); // CraftBukkit - decompile error
|
||||
- return (GameRules.GameRuleValue) this.J.get(gamerules_gamerulekey);
|
||||
+ return (T) this.J.get(gamerules_gamerulekey); // CraftBukkit - decompile error
|
||||
}
|
||||
|
||||
public NBTTagCompound a() {
|
||||
@@ -122,7 +122,7 @@
|
||||
@@ -137,8 +137,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
|
||||
}
|
||||
|
||||
public boolean getBoolean(GameRules.GameRuleKey<GameRules.GameRuleBoolean> gamerules_gamerulekey) {
|
||||
@@ -173,7 +173,7 @@
|
||||
@@ -189,7 +189,7 @@
|
||||
}
|
||||
|
||||
@Override
|
||||
- protected void setValue(String s) {
|
||||
+ public void setValue(String s) { // PAIL - private->public
|
||||
this.a = Boolean.parseBoolean(s);
|
||||
+ public void setValue(String s) { // PAIL - protected->public
|
||||
this.b = Boolean.parseBoolean(s);
|
||||
}
|
||||
|
||||
@@ -223,7 +223,7 @@
|
||||
@@ -244,7 +244,7 @@
|
||||
}
|
||||
|
||||
@Override
|
||||
- protected void setValue(String s) {
|
||||
+ public void setValue(String s) { // PAIL - private->public
|
||||
this.a = b(s);
|
||||
+ public void setValue(String s) { // PAIL - protected->public
|
||||
this.b = c(s);
|
||||
}
|
||||
|
||||
@@ -272,7 +272,7 @@
|
||||
@@ -298,7 +298,7 @@
|
||||
|
||||
}
|
||||
|
||||
- protected abstract void setValue(String s);
|
||||
+ public abstract void setValue(String s); // PAIL - private->public
|
||||
|
||||
protected abstract String getValue();
|
||||
public abstract String getValue();
|
||||
|
||||
@@ -302,7 +302,7 @@
|
||||
@@ -332,7 +332,7 @@
|
||||
}
|
||||
|
||||
public T getValue() {
|
||||
- return (GameRules.GameRuleValue) this.b.apply(this);
|
||||
+ return this.b.apply(this); // CraftBukkit - decompile error
|
||||
}
|
||||
}
|
||||
|
||||
public void a(GameRules.GameRuleVisitor gamerules_gamerulevisitor, GameRules.GameRuleKey<T> gamerules_gamerulekey) {
|
||||
|
Reference in New Issue
Block a user