Remove update physics patch as it causes issues with physics events

This commit is contained in:
md_5 2013-09-25 08:49:47 +10:00
parent 941af38ac7
commit 12f7c09853
6 changed files with 6 additions and 39 deletions

View File

@ -1,11 +1,11 @@
From 24b94662ec7f7cc5a9f7d953494ecfbbdb391035 Mon Sep 17 00:00:00 2001 From 2a1df2a53ded142a68685920c5a738696c186543 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 14 Sep 2013 10:16:38 +1000 Date: Sat, 14 Sep 2013 10:16:38 +1000
Subject: [PATCH] Update Inventory and Health for PlayerConsumeItemEvent Subject: [PATCH] Update Inventory and Health for PlayerConsumeItemEvent
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 0a35df8..e3c4d8c 100644 index b180933..36eca0f 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java --- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -258,6 +258,10 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen @@ -258,6 +258,10 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen

View File

@ -1,33 +0,0 @@
From 4715cecf8a6aca768fa90a38c78469cf1016eb6b Mon Sep 17 00:00:00 2001
From: Chad Waters <authorblues@gmail.com>
Date: Tue, 26 Mar 2013 07:47:43 -0400
Subject: [PATCH] Update Physics When Updating Attachables
Update physics for Attachable to update redstone. Fixes BUKKIT-1858
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
index 2072db2..c2ccc73 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
@@ -9,6 +9,7 @@ import org.bukkit.block.BlockState;
import org.bukkit.craftbukkit.CraftChunk;
import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.material.MaterialData;
+import org.bukkit.material.Attachable;
import org.bukkit.metadata.MetadataValue;
import org.bukkit.plugin.Plugin;
@@ -128,6 +129,10 @@ public class CraftBlockState implements BlockState {
}
block.setData(getRawData(), applyPhysics);
+ if (applyPhysics && data instanceof Attachable) {
+ Block rel = block.getRelative(((Attachable) data).getFacing(), -1);
+ world.getHandle().applyPhysics(rel.getX(), rel.getY(), rel.getZ(), block.getTypeId());
+ }
world.getHandle().notify(x, y, z);
return true;
--
1.8.1.2

View File

@ -1,4 +1,4 @@
From 6649bf8e5ea40c1620570364905bb6d8deabbfa8 Mon Sep 17 00:00:00 2001 From f0fcf1cdd831dea90719d24c8f8f48ea18c14863 Mon Sep 17 00:00:00 2001
From: Dylan Xaldin <Puremin0rez515@gmail.com> From: Dylan Xaldin <Puremin0rez515@gmail.com>
Date: Sat, 14 Sep 2013 11:02:34 +1000 Date: Sat, 14 Sep 2013 11:02:34 +1000
Subject: [PATCH] Nerf Zombie Lag Issues Subject: [PATCH] Nerf Zombie Lag Issues

View File

@ -1,4 +1,4 @@
From cacda76247284c121897d7db87e42868b7cf5377 Mon Sep 17 00:00:00 2001 From 5c0b8ad4ee0045477c67c6d6e37ae77bffaf4972 Mon Sep 17 00:00:00 2001
From: BlackHole <black-hole@live.com> From: BlackHole <black-hole@live.com>
Date: Tue, 16 Jul 2013 22:34:50 +0200 Date: Tue, 16 Jul 2013 22:34:50 +0200
Subject: [PATCH] Call EntityChangeBlockEvent for Fire Arrows hitting TNT Subject: [PATCH] Call EntityChangeBlockEvent for Fire Arrows hitting TNT

View File

@ -1,4 +1,4 @@
From 79440ab42fc945d2efec96be6ec3bb7667c18e71 Mon Sep 17 00:00:00 2001 From 7463a7f6ab3c97b4b4f5a7b4b6f2acbe5de1d091 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 21 Sep 2013 12:33:09 +1000 Date: Sat, 21 Sep 2013 12:33:09 +1000
Subject: [PATCH] Allow Disabling of 1.6.3 Structure Saving Subject: [PATCH] Allow Disabling of 1.6.3 Structure Saving

View File

@ -1,4 +1,4 @@
From a506a78c0160d17ca9b1a9e8fcaa17718a2e7678 Mon Sep 17 00:00:00 2001 From 249bb1fac815a77925401bfdf3c05d96f78df47c Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sun, 22 Sep 2013 19:10:53 +1000 Date: Sun, 22 Sep 2013 19:10:53 +1000
Subject: [PATCH] Item Despawn Rate Subject: [PATCH] Item Despawn Rate