Update to MC 1.12-pre2

This commit is contained in:
Zach Brown
2017-05-14 13:05:01 -05:00
parent 828d600143
commit 491286def4
151 changed files with 1315 additions and 1636 deletions

View File

@@ -1,11 +1,11 @@
From 1782bd7ccc4654e2402a73990ec26b47e58c1faf Mon Sep 17 00:00:00 2001
From 1d664d9326e3b0efc0924d92a47926ab2420661f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 28 Dec 2016 01:18:33 -0500
Subject: [PATCH] Firework API's
diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java
index 572f4dead..f9cf382b2 100644
index 5e452b93c..28e12f7cc 100644
--- a/src/main/java/net/minecraft/server/EntityFireworks.java
+++ b/src/main/java/net/minecraft/server/EntityFireworks.java
@@ -2,6 +2,8 @@ package net.minecraft.server;
@@ -51,9 +51,9 @@ index 572f4dead..f9cf382b2 100644
+ // Paper end
}
public boolean aV() {
public boolean bb() {
diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
index 4fc36d243..5cd68bfaf 100644
index dc8952340..b7569b2bd 100644
--- a/src/main/java/net/minecraft/server/ItemFireworks.java
+++ b/src/main/java/net/minecraft/server/ItemFireworks.java
@@ -9,6 +9,7 @@ public class ItemFireworks extends Item {
@@ -73,10 +73,10 @@ index 4fc36d243..5cd68bfaf 100644
if (!entityhuman.abilities.canInstantlyBuild) {
itemstack.subtract(1);
diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
index 2a2f53c82..266741fcd 100644
index e15c23367..82c2537b3 100644
--- a/src/main/java/net/minecraft/server/NBTTagCompound.java
+++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
@@ -103,7 +103,7 @@ public class NBTTagCompound extends NBTBase {
@@ -106,7 +106,7 @@ public class NBTTagCompound extends NBTBase {
return new UUID(this.getLong(s + "Most"), this.getLong(s + "Least"));
}
@@ -129,5 +129,5 @@ index 99746b3c2..d4fbe31d6 100644
+ // Paper end
}
--
2.12.2
2.13.0