mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity

Fix for #885

Browse Source
This commit is contained in:
SoSeDiK 2019-04-08 13:53:55 +03:00
parent 33073a4100
commit c04b293d62
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/me/mrCookieSlime/Slimefun/Android/ProgrammableAndroid.java
View File

@ -202,7 +202,7 @@ public abstract class ProgrammableAndroid extends SlimefunItem {
BlockStorage.addBlockInfo(b, "script", "START-TURN_LEFT-REPEAT"); BlockStorage.addBlockInfo(b, "script", "START-TURN_LEFT-REPEAT");
BlockStorage.addBlockInfo(b, "index", "0"); BlockStorage.addBlockInfo(b, "index", "0");
BlockStorage.addBlockInfo(b, "fuel", "0"); BlockStorage.addBlockInfo(b, "fuel", "0");
BlockStorage.addBlockInfo(b, "rotation", p.getFacing().toString()); BlockStorage.addBlockInfo(b, "rotation", p.getFacing().getOppositeFace().toString());
BlockStorage.addBlockInfo(b, "paused", "true"); BlockStorage.addBlockInfo(b, "paused", "true");
b.setType(Material.PLAYER_HEAD); b.setType(Material.PLAYER_HEAD);
Rotatable blockData = (Rotatable) b.getBlockData(); Rotatable blockData = (Rotatable) b.getBlockData();
@ -285,7 +285,7 @@ public abstract class ProgrammableAndroid extends SlimefunItem {
case GO_FORWARD: { case GO_FORWARD: {
try { try {
BlockFace face = BlockFace.valueOf(BlockStorage.getLocationInfo(b.getLocation(), "rotation")); BlockFace face = BlockFace.valueOf(BlockStorage.getLocationInfo(b.getLocation(), "rotation"));
Block block = b.getRelative(face.getOppositeFace()); Block block = b.getRelative(face);
move(b, face, block); move(b, face, block);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -693,12 +693,12 @@ public abstract class ProgrammableAndroid extends SlimefunItem {
} }
private void move(Block b, BlockFace face, Block block) throws Exception { private void move(Block b, BlockFace face, Block block) throws Exception {
if (block.getY() < 0 || block.getY() > block.getWorld().getMaxHeight()) return; if (block.getY() < 0 || block.getY() > block.getWorld().getMaxHeight())
return;
if (block.getType() == Material.AIR || block.getType() == Material.CAVE_AIR) { if (block.getType() == Material.AIR || block.getType() == Material.CAVE_AIR) {
block.setType(Material.PLAYER_HEAD); block.setType(Material.PLAYER_HEAD);
Rotatable blockData = (Rotatable) block.getBlockData(); Rotatable blockData = (Rotatable) block.getBlockData();
blockData.setRotation(face); blockData.setRotation(face.getOppositeFace());
block.setBlockData(blockData); block.setBlockData(blockData);
CustomSkull.setSkull(block, CustomSkull.getTexture(getItem())); CustomSkull.setSkull(block, CustomSkull.getTexture(getItem()));
b.setType(Material.AIR); b.setType(Material.AIR);
@ -746,7 +746,7 @@ public abstract class ProgrammableAndroid extends SlimefunItem {
block.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, block.getType()); block.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, block.getType());
block.setType(Material.PLAYER_HEAD); block.setType(Material.PLAYER_HEAD);
Rotatable blockData = (Rotatable) block.getBlockData(); Rotatable blockData = (Rotatable) block.getBlockData();
blockData.setRotation(face); blockData.setRotation(face.getOppositeFace());
block.setBlockData(blockData); block.setBlockData(blockData);
CustomSkull.setSkull(block, CustomSkull.getTexture(getItem())); CustomSkull.setSkull(block, CustomSkull.getTexture(getItem()));
b.setType(Material.AIR); b.setType(Material.AIR);
@ -762,7 +762,7 @@ public abstract class ProgrammableAndroid extends SlimefunItem {
block.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, block.getType()); block.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, block.getType());
block.setType(Material.PLAYER_HEAD); block.setType(Material.PLAYER_HEAD);
Rotatable blockData = (Rotatable) block.getBlockData(); Rotatable blockData = (Rotatable) block.getBlockData();
blockData.setRotation(face); blockData.setRotation(face.getOppositeFace());
block.setBlockData(blockData); block.setBlockData(blockData);
CustomSkull.setSkull(block, CustomSkull.getTexture(getItem())); CustomSkull.setSkull(block, CustomSkull.getTexture(getItem()));
b.setType(Material.AIR); b.setType(Material.AIR);