Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-25 20:16:19 +01:00
Code Issues Projects Releases Wiki Activity

Mappings Update

Browse Source
This commit is contained in:
md_5 2019-03-17 11:48:53 +11:00
parent 5259d80c48
commit a49270b28b
4 changed files with 8 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
nms-patches/ArgumentParserSelector.patch
View File

@ -1,32 +1,6 @@
--- a/net/minecraft/server/ArgumentParserSelector.java --- a/net/minecraft/server/ArgumentParserSelector.java
+++ b/net/minecraft/server/ArgumentParserSelector.java +++ b/net/minecraft/server/ArgumentParserSelector.java
@@ -97,9 +97,23 @@ @@ -126,7 +126,7 @@
this(stringreader, true);
}
+ // CraftBukkit start - decompile error
+ private static final CriterionConditionValue.c DEFAULT_q;
+ private static final CriterionConditionValue.d DEFAULT_r;
+
+ static {
+ try {
+ DEFAULT_q = (CriterionConditionValue.c) Class.forName("net.minecraft.server.CriterionConditionValue$c").getDeclaredField("e").get(null);
+ DEFAULT_r = (CriterionConditionValue.d) Class.forName("net.minecraft.server.CriterionConditionValue$d").getDeclaredField("e").get(null);
+ } catch (Exception ex) {
+ throw new AssertionError(ex);
+ }
+ }
+
public ArgumentParserSelector(StringReader stringreader, boolean flag) {
- this.q = CriterionConditionValue.c.e;
- this.r = CriterionConditionValue.d.e;
+ this.q = DEFAULT_q;
+ this.r = DEFAULT_r;
+ // CraftBukkit end
this.y = CriterionConditionRange.a;
this.z = CriterionConditionRange.a;
this.A = (entity) -> {
@@ -126,7 +140,7 @@
axisalignedbb = this.a(this.v == null ? 0.0D : this.v, this.w == null ? 0.0D : this.w, this.x == null ? 0.0D : this.x); axisalignedbb = this.a(this.v == null ? 0.0D : this.v, this.w == null ? 0.0D : this.w, this.x == null ? 0.0D : this.x);
} }
@ -35,7 +9,7 @@
if (this.s == null && this.t == null && this.u == null) { if (this.s == null && this.t == null && this.u == null) {
function = (vec3d) -> { function = (vec3d) -> {
@@ -187,8 +201,10 @@ @@ -187,8 +187,10 @@
}; };
} }
@ -48,7 +22,7 @@
this.G = this::d; this.G = this::d;
if (!this.l.canRead()) { if (!this.l.canRead()) {
throw ArgumentParserSelector.d.createWithContext(this.l); throw ArgumentParserSelector.d.createWithContext(this.l);
@@ -431,6 +447,12 @@ @@ -431,6 +433,12 @@
} }
public EntitySelector s() throws CommandSyntaxException { public EntitySelector s() throws CommandSyntaxException {
@ -61,7 +35,7 @@
this.E = this.l.getCursor(); this.E = this.l.getCursor();
this.G = this::b; this.G = this::b;
if (this.l.canRead() && this.l.peek() == '@') { if (this.l.canRead() && this.l.peek() == '@') {
@@ -439,7 +461,7 @@ @@ -439,7 +447,7 @@
} }
this.l.skip(); this.l.skip();

2
pom.xml
View File

@ -43,7 +43,7 @@
<dependency> <dependency>
<groupId>org.ow2.asm</groupId> <groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId> <artifactId>asm</artifactId>
<version>7.0</version> <version>7.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

2
src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
View File

@ -160,7 +160,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
* @return string * @return string
*/ */
public String getMappingsVersion() { public String getMappingsVersion() {
return "00ed8e5c39debc3ed194ad7c5645cc45"; return "7dd4b3ec31629620c41553e5c142e454";
} }
@Override @Override

4
src/test/java/org/bukkit/GameRuleTest.java
View File

@ -21,9 +21,9 @@ public class GameRuleTest {
@Test @Test
public void testMinecraftRules() { public void testMinecraftRules() {
TreeMap<String, GameRules.b> minecraftRules = GameRules.getGameRules(); TreeMap<String, GameRules.GameRuleDefinition> minecraftRules = GameRules.getGameRules();
for (Map.Entry<String, GameRules.b> entry : minecraftRules.entrySet()) { for (Map.Entry<String, GameRules.GameRuleDefinition> entry : minecraftRules.entrySet()) {
GameRule<?> bukkitRule = GameRule.getByName(entry.getKey()); GameRule<?> bukkitRule = GameRule.getByName(entry.getKey());
Assert.assertNotNull(bukkitRule); Assert.assertNotNull(bukkitRule);