Upstream/WorldBorder
1
0
Fork 0
mirror of https://github.com/Brettflan/WorldBorder.git synced 2024-11-26 12:05:26 +01:00
Code Issues Projects Releases Wiki Activity

Updated isSafeSpot method to use Block Types

Browse Source 
Updated the isSafeSpot method to stop using blockIDs and start using
Block Types and Materials. Also simplified the code some, making sure it
had breathable space to teleport to, and a non-dangerous block to stand
on.

It should have same results.
This commit is contained in:
clone2204 2015-02-08 02:26:07 -06:00
parent 211a40f893
commit d093c3fc43
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/com/wimbli/WorldBorder/BorderData.java
View File

@ -1,11 +1,17 @@
package com.wimbli.WorldBorder; package com.wimbli.WorldBorder;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import net.minecraft.server.v1_7_R4.Blocks;
import org.bukkit.Bukkit;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.block.Block;
public class BorderData public class BorderData
@ -290,29 +296,24 @@ public class BorderData
return correctedPosition(loc, Config.ShapeRound(), false); return correctedPosition(loc, Config.ShapeRound(), false);
} }
//these material IDs are acceptable for places to teleport player; breathable blocks and water public static final ArrayList<Material> stupidPlatforms = new ArrayList<Material>(Arrays.asList(new Material[] {Material.STATIONARY_LAVA, Material.LAVA, Material.CACTUS, Material.FENCE_GATE, Material.WEB, Material.SIGN, Material.SIGN_POST}));
public static final LinkedHashSet<Integer> safeOpenBlocks = new LinkedHashSet<Integer>(Arrays.asList(
new Integer[] {0, 6, 8, 9, 27, 28, 30, 31, 32, 37, 38, 39, 40, 50, 55, 59, 63, 64, 65, 66, 68, 69, 70, 71, 72, 75, 76, 77, 78, 83, 90, 93, 94, 96, 104, 105, 106, 115, 131, 132, 141, 142, 149, 150, 157, 171}
));
//these material IDs are ones we don't want to drop the player onto, like cactus or lava or fire or activated Ender portal
public static final LinkedHashSet<Integer> painfulBlocks = new LinkedHashSet<Integer>(Arrays.asList(
new Integer[] {10, 11, 51, 81, 119}
));
// check if a particular spot consists of 2 breathable blocks over something relatively solid // check if a particular spot consists of 2 breathable blocks over something relatively solid
private boolean isSafeSpot(World world, int X, int Y, int Z, boolean flying) private boolean isSafeSpot(World world, int X, int Y, int Z, boolean flying)
{ {
boolean safe = safeOpenBlocks.contains((Integer)world.getBlockTypeIdAt(X, Y, Z)) // target block open and safe
&& safeOpenBlocks.contains((Integer)world.getBlockTypeIdAt(X, Y + 1, Z)); // above target block open and safe
if (!safe || flying)
return safe;
Integer below = (Integer)world.getBlockTypeIdAt(X, Y - 1, Z); //Checks for two clear blocks with a solid base to stand on
return (safe boolean emptySpace = ((world.getBlockAt(X, Y, Z).isEmpty() || world.getBlockAt(X, Y, Z).getType().isTransparent()) && (world.getBlockAt(X, Y + 1, Z).isEmpty() || world.getBlockAt(X, Y + 1, Z).getType().isTransparent()) && (world.getBlockAt(X, Y - 1, Z).isEmpty() != true));
&& (!safeOpenBlocks.contains(below) || below == 8 || below == 9) // below target block not open/breathable (so presumably solid), or is water
&& !painfulBlocks.contains(below) // below target block not painful //Checks if base is safe to stand on
); Material platform = world.getBlockAt(X, Y - 1, Z).getType();
boolean stupidPlatform = stupidPlatforms.contains(platform);
boolean safe = emptySpace && (stupidPlatform != true);
return (flying || safe);
} }
private static final int limBot = 1; private static final int limBot = 1;