summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/BlockButton.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockButton.java')
-rw-r--r--src/main/java/net/minecraft/server/BlockButton.java130
1 files changed, 56 insertions, 74 deletions
diff --git a/src/main/java/net/minecraft/server/BlockButton.java b/src/main/java/net/minecraft/server/BlockButton.java
index 9f11dec6..ba4d1fe8 100644
--- a/src/main/java/net/minecraft/server/BlockButton.java
+++ b/src/main/java/net/minecraft/server/BlockButton.java
@@ -35,46 +35,32 @@ public class BlockButton extends Block {
return world.d(i - 1, j, k) ? true : (world.d(i + 1, j, k) ? true : (world.d(i, j, k - 1) ? true : world.d(i, j, k + 1)));
}
- public void c(World world, int i, int j, int k, int l) {
+ public void d(World world, int i, int j, int k, int l) {
int i1 = world.getData(i, j, k);
int j1 = i1 & 8;
i1 &= 7;
if (l == 2 && world.d(i, j, k + 1)) {
i1 = 4;
- }
-
- if (l == 3 && world.d(i, j, k - 1)) {
+ } else if (l == 3 && world.d(i, j, k - 1)) {
i1 = 3;
- }
-
- if (l == 4 && world.d(i + 1, j, k)) {
+ } else if (l == 4 && world.d(i + 1, j, k)) {
i1 = 2;
- }
-
- if (l == 5 && world.d(i - 1, j, k)) {
+ } else if (l == 5 && world.d(i - 1, j, k)) {
i1 = 1;
+ } else {
+ i1 = this.g(world, i, j, k);
}
world.c(i, j, k, i1 + j1);
}
- public void e(World world, int i, int j, int k) {
- if (world.d(i - 1, j, k)) {
- world.c(i, j, k, 1);
- } else if (world.d(i + 1, j, k)) {
- world.c(i, j, k, 2);
- } else if (world.d(i, j, k - 1)) {
- world.c(i, j, k, 3);
- } else if (world.d(i, j, k + 1)) {
- world.c(i, j, k, 4);
- }
-
- this.g(world, i, j, k);
+ private int g(World world, int i, int j, int k) {
+ return world.d(i - 1, j, k) ? 1 : (world.d(i + 1, j, k) ? 2 : (world.d(i, j, k - 1) ? 3 : (world.d(i, j, k + 1) ? 4 : 1)));
}
- public void b(World world, int i, int j, int k, int l) {
- if (this.g(world, i, j, k)) {
+ public void a(World world, int i, int j, int k, int l) {
+ if (this.h(world, i, j, k)) {
int i1 = world.getData(i, j, k) & 7;
boolean flag = false;
@@ -95,15 +81,15 @@ public class BlockButton extends Block {
}
if (flag) {
- this.a_(world, i, j, k, world.getData(i, j, k));
+ this.b_(world, i, j, k, world.getData(i, j, k));
world.e(i, j, k, 0);
}
}
}
- private boolean g(World world, int i, int j, int k) {
+ private boolean h(World world, int i, int j, int k) {
if (!this.a(world, i, j, k)) {
- this.a_(world, i, j, k, world.getData(i, j, k));
+ this.b_(world, i, j, k, world.getData(i, j, k));
world.e(i, j, k, 0);
return false;
} else {
@@ -140,60 +126,56 @@ public class BlockButton extends Block {
}
public boolean a(World world, int i, int j, int k, EntityHuman entityhuman) {
- if (world.isStatic) {
+ // CraftBukkit start - Interact Button
+ CraftWorld craftWorld = ((WorldServer) world).getWorld();
+ CraftServer server = ((WorldServer) world).getServer();
+ Type eventType = Type.BLOCK_INTERACT;
+ CraftBlock block = (CraftBlock) craftWorld.getBlockAt(i, j, k);
+ LivingEntity who = (entityhuman == null) ? null : (LivingEntity) entityhuman.getBukkitEntity();
+
+ BlockInteractEvent event = new BlockInteractEvent(eventType, block, who);
+ server.getPluginManager().callEvent(event);
+
+ if (event.isCancelled()) {
return true;
- } else {
- // CraftBukkit start - Interact Button
- CraftWorld craftWorld = ((WorldServer) world).getWorld();
- CraftServer server = ((WorldServer) world).getServer();
- Type eventType = Type.BLOCK_INTERACT;
- CraftBlock block = (CraftBlock) craftWorld.getBlockAt(i, j, k);
- LivingEntity who = (entityhuman == null) ? null : (LivingEntity) entityhuman.getBukkitEntity();
+ }
+ // CraftBukkit end
- BlockInteractEvent event = new BlockInteractEvent(eventType, block, who);
- server.getPluginManager().callEvent(event);
+ int l = world.getData(i, j, k);
+ int i1 = l & 7;
+ int j1 = 8 - (l & 8);
- if (event.isCancelled()) {
+ if (j1 == 0) {
+ return true;
+ } else {
+ // Craftbukkit start
+ int old = (j1 != 8) ? 1 : 0;
+ int current = (j1 == 8) ? 1 : 0;
+ BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(block, old, current);
+ server.getPluginManager().callEvent(eventRedstone);
+ if ((eventRedstone.getNewCurrent() > 0) != (j1 == 8)) {
return true;
}
- // CraftBukkit end
-
- int l = world.getData(i, j, k);
- int i1 = l & 7;
- int j1 = 8 - (l & 8);
+ // Craftbukkit end
- if (j1 == 0) {
- return true;
+ world.c(i, j, k, i1 + j1);
+ world.b(i, j, k, i, j, k);
+ world.a((double) i + 0.5D, (double) j + 0.5D, (double) k + 0.5D, "random.click", 0.3F, 0.6F);
+ world.h(i, j, k, this.id);
+ if (i1 == 1) {
+ world.h(i - 1, j, k, this.id);
+ } else if (i1 == 2) {
+ world.h(i + 1, j, k, this.id);
+ } else if (i1 == 3) {
+ world.h(i, j, k - 1, this.id);
+ } else if (i1 == 4) {
+ world.h(i, j, k + 1, this.id);
} else {
- // Craftbukkit start
- int old = (j1 != 8) ? 1 : 0;
- int current = (j1 == 8) ? 1 : 0;
- BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(block, old, current);
- server.getPluginManager().callEvent(eventRedstone);
- if ((eventRedstone.getNewCurrent() > 0) != (j1 == 8)) {
- return true;
- }
- // Craftbukkit end
-
- world.c(i, j, k, i1 + j1);
- world.b(i, j, k, i, j, k);
- world.a((double) i + 0.5D, (double) j + 0.5D, (double) k + 0.5D, "random.click", 0.3F, 0.6F);
- world.h(i, j, k, this.id);
- if (i1 == 1) {
- world.h(i - 1, j, k, this.id);
- } else if (i1 == 2) {
- world.h(i + 1, j, k, this.id);
- } else if (i1 == 3) {
- world.h(i, j, k - 1, this.id);
- } else if (i1 == 4) {
- world.h(i, j, k + 1, this.id);
- } else {
- world.h(i, j - 1, k, this.id);
- }
-
- world.i(i, j, k, this.id);
- return true;
+ world.h(i, j - 1, k, this.id);
}
+
+ world.c(i, j, k, this.id, this.b());
+ return true;
}
}
@@ -224,7 +206,7 @@ public class BlockButton extends Block {
return (iblockaccess.getData(i, j, k) & 8) > 0;
}
- public boolean d(World world, int i, int j, int k, int l) {
+ public boolean c(World world, int i, int j, int k, int l) {
int i1 = world.getData(i, j, k);
if ((i1 & 8) == 0) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 16:50:44 +0000