Update to Minecraft 1.8.3

By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-02-26 22:41:06 +00:00
parent d789ce91d4
commit 85be409b13
347 changed files with 5027 additions and 5465 deletions

View File

@@ -1,32 +1,28 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/PacketPlayInBlockPlace.java 2014-11-28 17:43:43.273707431 +0000
+++ src/main/java/net/minecraft/server/PacketPlayInBlockPlace.java 2014-11-28 17:38:21.000000000 +0000
@@ -9,6 +9,8 @@
private float e;
--- /home/matt/mc-dev-private//net/minecraft/server/PacketPlayInBlockPlace.java 2015-02-26 22:40:22.907608136 +0000
+++ src/main/java/net/minecraft/server/PacketPlayInBlockPlace.java 2015-02-26 22:40:22.907608136 +0000
@@ -12,6 +12,8 @@
private float f;
private float g;
+
+ public long timestamp; // CraftBukkit
+ public long timestamp; // CraftBukkit
+
public PacketPlayInBlockPlace() {}
@@ -26,6 +28,7 @@
public PacketPlayInBlockPlace(ItemStack itemstack) {
@@ -28,6 +30,7 @@
}
public void a(PacketDataSerializer packetdataserializer) {
public void a(PacketDataSerializer packetdataserializer) throws IOException {
+ timestamp = System.currentTimeMillis(); // CraftBukkit
this.b = packetdataserializer.c();
this.c = packetdataserializer.readUnsignedByte();
this.d = packetdataserializer.i();
@@ -71,7 +74,10 @@
@@ -72,8 +75,4 @@
public float f() {
return this.g;
}
-
- public void a(PacketListener packetlistener) {
- this.a((PacketListenerPlayIn) packetlistener);
+ // CraftBukkit start - fix decompile error
+ @Override
+ public void a(PacketListener pl) {
+ a((PacketListenerPlayIn)pl);
}
+ // CraftBukkit end
- }
}