Update to Minecraft 1.15

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-12-11 09:00:00 +11:00
parent 1400103b2f
commit 0e142c7f03
293 changed files with 2875 additions and 2648 deletions

View File

@@ -1,15 +1,15 @@
--- a/net/minecraft/server/GameRules.java
+++ b/net/minecraft/server/GameRules.java
@@ -78,7 +78,7 @@
@@ -92,7 +92,7 @@
}
public <T extends GameRules.GameRuleValue<T>> T get(GameRules.GameRuleKey<T> gamerules_gamerulekey) {
- return (GameRules.GameRuleValue) this.A.get(gamerules_gamerulekey);
+ return (T) this.A.get(gamerules_gamerulekey); // CraftBukkit - decompile error
- return (GameRules.GameRuleValue) this.F.get(gamerules_gamerulekey);
+ return (T) this.F.get(gamerules_gamerulekey); // CraftBukkit - decompile error
}
public NBTTagCompound a() {
@@ -103,7 +103,7 @@
@@ -120,7 +120,7 @@
}
private static <T extends GameRules.GameRuleValue<T>> void a(GameRules.GameRuleVisitor gamerules_gamerulevisitor, GameRules.GameRuleKey<?> gamerules_gamerulekey, GameRules.GameRuleDefinition<?> gamerules_gameruledefinition) {
@@ -18,7 +18,7 @@
}
public boolean getBoolean(GameRules.GameRuleKey<GameRules.GameRuleBoolean> gamerules_gamerulekey) {
@@ -154,7 +154,7 @@
@@ -171,7 +171,7 @@
}
@Override
@@ -27,7 +27,7 @@
this.a = Boolean.parseBoolean(s);
}
@@ -204,7 +204,7 @@
@@ -221,7 +221,7 @@
}
@Override
@@ -36,7 +36,7 @@
this.a = b(s);
}
@@ -253,7 +253,7 @@
@@ -270,7 +270,7 @@
}
@@ -45,7 +45,7 @@
protected abstract String getValue();
@@ -283,7 +283,7 @@
@@ -300,7 +300,7 @@
}
public T getValue() {