diff --git a/pom.xml b/pom.xml index f4ce533..1f30ee5 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.wimbli.WorldBorder WorldBorder - 1.7.2b + 1.7.3 WorldBorder https://github.com/Brettflan/WorldBorder @@ -30,7 +30,7 @@ org.bukkit bukkit - 1.5.2-R0.1 + 1.6.1-R0.1-SNAPSHOT org.dynmap diff --git a/src/main/java/com/wimbli/WorldBorder/BorderData.java b/src/main/java/com/wimbli/WorldBorder/BorderData.java index 4cbb36c..325189c 100644 --- a/src/main/java/com/wimbli/WorldBorder/BorderData.java +++ b/src/main/java/com/wimbli/WorldBorder/BorderData.java @@ -292,7 +292,7 @@ public class BorderData //these material IDs are acceptable for places to teleport player; breathable blocks and water public static final LinkedHashSet safeOpenBlocks = new LinkedHashSet(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} + 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 diff --git a/src/main/java/com/wimbli/WorldBorder/Config.java b/src/main/java/com/wimbli/WorldBorder/Config.java index 096178a..ab42213 100644 --- a/src/main/java/com/wimbli/WorldBorder/Config.java +++ b/src/main/java/com/wimbli/WorldBorder/Config.java @@ -14,7 +14,10 @@ import java.util.Set; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.Effect; import org.bukkit.entity.Player; +import org.bukkit.Location; +import org.bukkit.World; public class Config @@ -213,6 +216,20 @@ public class Config return whooshEffect; } + public static void showWhooshEffect(Location loc) + { + if (!whooshEffect()) + return; + + World world = loc.getWorld(); + world.playEffect(loc, Effect.ENDER_SIGNAL, 0); + world.playEffect(loc, Effect.ENDER_SIGNAL, 0); + world.playEffect(loc, Effect.SMOKE, 4); + world.playEffect(loc, Effect.SMOKE, 4); + world.playEffect(loc, Effect.SMOKE, 4); + world.playEffect(loc, Effect.GHAST_SHOOT, 0); + } + public static void setPortalRedirection(boolean enable) { portalRedirection = enable; diff --git a/src/main/java/com/wimbli/WorldBorder/WorldFillTask.java b/src/main/java/com/wimbli/WorldBorder/WorldFillTask.java index 7d837f8..1886e41 100644 --- a/src/main/java/com/wimbli/WorldBorder/WorldFillTask.java +++ b/src/main/java/com/wimbli/WorldBorder/WorldFillTask.java @@ -120,6 +120,7 @@ public class WorldFillTask implements Runnable } + @Override public void run() { if (continueNotice)