From 4b61cd6e607554c854575a2e62450d5e6b23c747 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sun, 15 Mar 2015 22:18:05 +0000 Subject: [PATCH] Add missing mc-dev import --- CraftBukkit-Patches/0002-mc-dev-imports.patch | 24 ++++++++++++++++++- ...-block-placement-interaction-packets.patch | 21 +++++++++++++++- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/CraftBukkit-Patches/0002-mc-dev-imports.patch b/CraftBukkit-Patches/0002-mc-dev-imports.patch index c510a975b..d935dcf89 100644 --- a/CraftBukkit-Patches/0002-mc-dev-imports.patch +++ b/CraftBukkit-Patches/0002-mc-dev-imports.patch @@ -1,4 +1,4 @@ -From d69d53f8ab2ce47b0b39cd6bce280146f4ae04b4 Mon Sep 17 00:00:00 2001 +From fb94f1e23aacd0bf284e7451927d6062eecddfad Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 1 Dec 2013 15:10:48 +1100 Subject: [PATCH] mc-dev imports @@ -3001,6 +3001,28 @@ index 0000000..670d626 + } + } +} +diff --git a/src/main/java/net/minecraft/server/PacketPlayInArmAnimation.java b/src/main/java/net/minecraft/server/PacketPlayInArmAnimation.java +new file mode 100644 +index 0000000..c611db1 +--- /dev/null ++++ b/src/main/java/net/minecraft/server/PacketPlayInArmAnimation.java +@@ -0,0 +1,16 @@ ++package net.minecraft.server; ++ ++import java.io.IOException; ++ ++public class PacketPlayInArmAnimation implements Packet { ++ ++ public PacketPlayInArmAnimation() {} ++ ++ public void a(PacketDataSerializer packetdataserializer) throws IOException {} ++ ++ public void b(PacketDataSerializer packetdataserializer) throws IOException {} ++ ++ public void a(PacketListenerPlayIn packetlistenerplayin) { ++ packetlistenerplayin.a(this); ++ } ++} diff --git a/src/main/java/net/minecraft/server/PacketPlayInChat.java b/src/main/java/net/minecraft/server/PacketPlayInChat.java new file mode 100644 index 0000000..0ab90f3 diff --git a/CraftBukkit-Patches/0125-Limit-block-placement-interaction-packets.patch b/CraftBukkit-Patches/0125-Limit-block-placement-interaction-packets.patch index 65accfcf1..732d6d798 100644 --- a/CraftBukkit-Patches/0125-Limit-block-placement-interaction-packets.patch +++ b/CraftBukkit-Patches/0125-Limit-block-placement-interaction-packets.patch @@ -1,9 +1,28 @@ -From bbc82ac5ec6cf152414fa0b8e7ccd080535cc993 Mon Sep 17 00:00:00 2001 +From 0c4bed4b7bcd2b27939a8d1324778f09fa2b5fc1 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sun, 29 Jun 2014 21:10:34 +0100 Subject: [PATCH] Limit block placement/interaction packets +diff --git a/src/main/java/net/minecraft/server/PacketPlayInArmAnimation.java b/src/main/java/net/minecraft/server/PacketPlayInArmAnimation.java +index c611db1..28cb5e3 100644 +--- a/src/main/java/net/minecraft/server/PacketPlayInArmAnimation.java ++++ b/src/main/java/net/minecraft/server/PacketPlayInArmAnimation.java +@@ -4,9 +4,13 @@ import java.io.IOException; + + public class PacketPlayInArmAnimation implements Packet { + ++ public long timestamp; // Spigot ++ + public PacketPlayInArmAnimation() {} + +- public void a(PacketDataSerializer packetdataserializer) throws IOException {} ++ public void a(PacketDataSerializer packetdataserializer) throws IOException { ++ timestamp = System.currentTimeMillis(); // Spigot ++ } + + public void b(PacketDataSerializer packetdataserializer) throws IOException {} + diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java index ee6fa34..d63c65d 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java