From 27046119774192ebad1c6c05f98b5adacf74ccab Mon Sep 17 00:00:00 2001 From: Myles Date: Thu, 3 Mar 2016 22:48:17 +0000 Subject: [PATCH] Cancel sounds properly, fixes block placing issue on bungee. Updated version to 0.4.8 --- README.md | 4 ++-- pom.xml | 2 +- .../us/myles/ViaVersion/transformers/IncomingTransformer.java | 2 +- .../us/myles/ViaVersion/transformers/OutgoingTransformer.java | 4 +--- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 9fd64cfa5..7cdf42533 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ViaVersion 0.4.7 +# ViaVersion 0.4.8 **Allows the connection of 1.8 clients to 1.9** This plugin modifies netty to allow connection of 1.9 clients to 1.8, @@ -9,7 +9,7 @@ This plugin modifies netty to allow connection of 1.9 clients to 1.8, Attempt to make boats nicer when they don't work -Remap spawn eggs +Remap potions If you have a bug with entities, please report the full stack trace diff --git a/pom.xml b/pom.xml index 48f55e744..c5a42fc15 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ us.myles ViaVersion - 0.4.7 + 0.4.8 ViaVersion-${version} diff --git a/src/main/java/us/myles/ViaVersion/transformers/IncomingTransformer.java b/src/main/java/us/myles/ViaVersion/transformers/IncomingTransformer.java index 52179f694..a625595a2 100644 --- a/src/main/java/us/myles/ViaVersion/transformers/IncomingTransformer.java +++ b/src/main/java/us/myles/ViaVersion/transformers/IncomingTransformer.java @@ -204,7 +204,7 @@ public class IncomingTransformer { // write item in hand ItemStack inHand = ViaVersionPlugin.getHandItem(info); try { - us.myles.ViaVersion.slot.ItemSlotRewriter.ItemStack item = us.myles.ViaVersion.slot.ItemSlotRewriter.ItemStack.fromBukkit(inHand); + ItemSlotRewriter.ItemStack item = ItemSlotRewriter.ItemStack.fromBukkit(inHand); ItemSlotRewriter.fixIdsFrom1_9To1_8(item); ItemSlotRewriter.writeItemStack(item, output); } catch (Exception e) { diff --git a/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java b/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java index 6f3dedbbe..79b593799 100644 --- a/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java +++ b/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java @@ -65,9 +65,7 @@ public class OutgoingTransformer { String newname = name; if (effect != null) { if (effect.isBreakPlaceSound()) { - input.readBytes(input.readableBytes()); - output.clear(); - return; + throw new CancelException(); } catid = effect.getCategory().getId(); newname = effect.getNewName();