Improved trapdoor hook.

This commit is contained in:
Eloraam 2011-09-01 08:01:47 +00:00
parent 3e09d92cd4
commit 8ced84d8d3

View file

@ -745,7 +745,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTorc
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java
--- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-08-30 03:13:17.000000000 -0400 --- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-08-30 03:13:17.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-08-30 03:13:19.000000000 -0400 +++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-01 04:00:04.000000000 -0400
@@ -147,7 +147,7 @@ @@ -147,7 +147,7 @@
{ {
j1--; j1--;
@ -755,7 +755,15 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTrap
{ {
world.setBlockWithNotify(i, j, k, 0); world.setBlockWithNotify(i, j, k, 0);
dropBlockAsItem(world, i, j, k, i1); dropBlockAsItem(world, i, j, k, i1);
@@ -213,11 +213,15 @@ @@ -189,6 +189,7 @@
public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l)
{
+ if(disableValidation) return true;
if(l == 0)
{
return false;
@@ -213,11 +214,15 @@
{ {
i--; i--;
} }
@ -2702,7 +2710,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
} }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java
--- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-08-30 03:13:19.000000000 -0400 --- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-08-30 03:13:19.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-08-30 03:13:19.000000000 -0400 +++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-01 04:00:11.000000000 -0400
@@ -130,7 +130,7 @@ @@ -130,7 +130,7 @@
{ {
j1--; j1--;
@ -2712,7 +2720,15 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
{ {
world.setBlockWithNotify(i, j, k, 0); world.setBlockWithNotify(i, j, k, 0);
dropBlockAsItem(world, i, j, k, i1); dropBlockAsItem(world, i, j, k, i1);
@@ -196,11 +196,15 @@ @@ -172,6 +172,7 @@
public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l)
{
+ if(disableValidation) return true;
if(l == 0)
{
return false;
@@ -196,11 +197,15 @@
{ {
i--; i--;
} }