Remove patch that prevents piston extend event firing twice - causes pistons to eat blocks on some occasions. Thanks Salaman and his team for debugging.

This commit is contained in:
md_5 2013-07-09 13:16:16 +10:00
parent 5a70ec4f37
commit 6b3632e736
4 changed files with 4 additions and 26 deletions

View file

@ -1,22 +0,0 @@
From 3f3055e1d22a5e282a55b2e522c747ba02aee471 Mon Sep 17 00:00:00 2001
From: Zarius <zariust@gmail.com>
Date: Thu, 25 Apr 2013 03:08:24 +1000
Subject: [PATCH] Don't Fire PistonExtendEvent Twice
Set data earlier for BlockPiston when extending. Fixes BUKKIT-3523
diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java
index 2d9e766..b2c8499 100644
--- a/src/main/java/net/minecraft/server/BlockPiston.java
+++ b/src/main/java/net/minecraft/server/BlockPiston.java
@@ -71,6 +71,7 @@ public class BlockPiston extends Block {
if (event.isCancelled()) {
return;
}
+ world.setData(i, j, k, i1 | 8, 2);
// CraftBukkit end
world.playNote(i, j, k, this.id, 0, i1);
--
1.8.1.2

View file

@ -1,4 +1,4 @@
From 918e293626aa88f3c390a1397474f5e861a688d1 Mon Sep 17 00:00:00 2001
From 020f20585ed19fd45c8b75c28ca058530d416dc8 Mon Sep 17 00:00:00 2001
From: Alex Ciuba <alexciuba@gmail.com>
Date: Tue, 11 Jun 2013 15:23:03 -0400
Subject: [PATCH] Prevent Ghost Players Caused by Plugins

View file

@ -1,4 +1,4 @@
From 183a4c8ebcc8c7b52496fbe4cba25a8bb58e7676 Mon Sep 17 00:00:00 2001
From baf9de6d6d274ba32b58281082dd75e02fa12d8a Mon Sep 17 00:00:00 2001
From: Jim Bilbrey <jb_aero@verizon.net>
Date: Wed, 19 Jun 2013 05:38:05 -0400
Subject: [PATCH] Define Ambient Setting of Potion Effects
@ -13,7 +13,7 @@ This also changes livingEntity.getActivePotionEffects() to construct the
PotionEffects using the ambient setting supplied by the MobEffects.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 1d52866..9d9320f 100644
index 3db1b22..443dde9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -258,7 +258,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

View file

@ -1,4 +1,4 @@
From 382891b2f5b82a30114ea150233113710a72da94 Mon Sep 17 00:00:00 2001
From d3cd68685c249b915b36b0dcfe7fbd74d7501da8 Mon Sep 17 00:00:00 2001
From: Phillip Schichtel <quick_wango@code-infection.de>
Date: Fri, 5 Jul 2013 21:55:00 +1000
Subject: [PATCH] Console Command Completion