summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTal Eisenberg <eisental@gmail.com>2011-01-21 16:30:18 -0800
committerErik Broes <erikbroes@grum.nl>2011-02-12 00:19:59 +0100
commitc36a98db64c8e42af77940aea6bf4f26f6931dea (patch)
tree7bde8dba4535783e807310b5c4d4eceea3632aac /src
parente44bb33109dcb47bb20ab5c9d27894a244403bb3 (diff)
downloadbukkit-c36a98db64c8e42af77940aea6bf4f26f6931dea.tar
bukkit-c36a98db64c8e42af77940aea6bf4f26f6931dea.tar.gz
bukkit-c36a98db64c8e42af77940aea6bf4f26f6931dea.tar.lz
bukkit-c36a98db64c8e42af77940aea6bf4f26f6931dea.tar.xz
bukkit-c36a98db64c8e42af77940aea6bf4f26f6931dea.zip
Fixed Button/Lever, using a logical AND instead of XOR to get 3 face bits
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/bukkit/material/Button.java3
-rw-r--r--src/main/java/org/bukkit/material/Lever.java3
2 files changed, 2 insertions, 4 deletions
diff --git a/src/main/java/org/bukkit/material/Button.java b/src/main/java/org/bukkit/material/Button.java
index 21335f2e..c3c7abd8 100644
--- a/src/main/java/org/bukkit/material/Button.java
+++ b/src/main/java/org/bukkit/material/Button.java
@@ -1,4 +1,3 @@
-
package org.bukkit.material;
import org.bukkit.block.BlockFace;
@@ -40,7 +39,7 @@ public class Button extends MaterialData implements Redstone, Attachable {
* @return BlockFace attached to
*/
public BlockFace getAttachedFace() {
- byte data = (byte) (getData() ^ 0x7);
+ byte data = (byte) (getData() & 0x7);
switch (data) {
case 0x1:
diff --git a/src/main/java/org/bukkit/material/Lever.java b/src/main/java/org/bukkit/material/Lever.java
index 5d6e7f4c..4d9742ca 100644
--- a/src/main/java/org/bukkit/material/Lever.java
+++ b/src/main/java/org/bukkit/material/Lever.java
@@ -1,4 +1,3 @@
-
package org.bukkit.material;
import org.bukkit.block.BlockFace;
@@ -40,7 +39,7 @@ public class Lever extends MaterialData implements Redstone, Attachable {
* @return BlockFace attached to
*/
public BlockFace getAttachedFace() {
- byte data = (byte) (getData() ^ 0x7);
+ byte data = (byte) (getData() & 0x7);
switch (data) {
case 0x1: