Upstream
/
WorldBorder
mirror of https://github.com/Brettflan/WorldBorder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updated target Bukkit lib version to 1.6.1-R0.1-SNAPSHOT 

Added carpet to safe open block list
Added showWhooshEffect(Location loc) helper method to Config class to show the whoosh effect, if it is enabled
This commit is contained in:
Brettflan 2013-07-05 15:28:13 -05:00
parent fa5fb33da8
commit 5d745ca788
4 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.wimbli.WorldBorder</groupId>
<artifactId>WorldBorder</artifactId>
<version>1.7.2b</version>
<version>1.7.3</version>
<name>WorldBorder</name>
<url>https://github.com/Brettflan/WorldBorder</url>
<issueManagement>
@ -30,7 +30,7 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.5.2-R0.1</version>
<version>1.6.1-R0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.dynmap</groupId>

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

@ -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<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}
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

17
src/main/java/com/wimbli/WorldBorder/Config.java
View File

@ -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;

1
src/main/java/com/wimbli/WorldBorder/WorldFillTask.java
View File

@ -120,6 +120,7 @@ public class WorldFillTask implements Runnable
}
@Override
public void run()
{
if (continueNotice)