Merge pull request #1 from Brettflan/master
initial test update for MC 1.8 Spigot... fix for border check routine fa...
This commit is contained in:
commit
b577593e08
16
pom.xml
16
pom.xml
|
@ -3,7 +3,7 @@
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>com.wimbli.WorldBorder</groupId>
|
<groupId>com.wimbli.WorldBorder</groupId>
|
||||||
<artifactId>WorldBorder</artifactId>
|
<artifactId>WorldBorder</artifactId>
|
||||||
<version>1.8.1</version>
|
<version>1.8.2_dev</version>
|
||||||
<name>WorldBorder</name>
|
<name>WorldBorder</name>
|
||||||
<url>https://github.com/Brettflan/WorldBorder</url>
|
<url>https://github.com/Brettflan/WorldBorder</url>
|
||||||
<issueManagement>
|
<issueManagement>
|
||||||
|
@ -17,8 +17,8 @@
|
||||||
|
|
||||||
<repositories>
|
<repositories>
|
||||||
<repository>
|
<repository>
|
||||||
<id>bukkit-repo</id>
|
<id>spigot-repo</id>
|
||||||
<url>http://repo.bukkit.org/content/groups/public/</url>
|
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
|
||||||
</repository>
|
</repository>
|
||||||
<repository>
|
<repository>
|
||||||
<id>dynmap-repo</id>
|
<id>dynmap-repo</id>
|
||||||
|
@ -27,11 +27,19 @@
|
||||||
</repositories>
|
</repositories>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
<!--Spigot-API-->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.spigotmc</groupId>
|
||||||
|
<artifactId>spigot-api</artifactId>
|
||||||
|
<version>1.8-R0.1-SNAPSHOT</version>
|
||||||
|
</dependency>
|
||||||
|
<!--Bukkit API-->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.bukkit</groupId>
|
<groupId>org.bukkit</groupId>
|
||||||
<artifactId>bukkit</artifactId>
|
<artifactId>bukkit</artifactId>
|
||||||
<version>1.7.9-R0.3-SNAPSHOT</version>
|
<version>1.8-R0.1-SNAPSHOT</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<!--Dynmap API-->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.dynmap</groupId>
|
<groupId>org.dynmap</groupId>
|
||||||
<artifactId>dynmap-api</artifactId>
|
<artifactId>dynmap-api</artifactId>
|
||||||
|
|
|
@ -1,9 +1,12 @@
|
||||||
package com.wimbli.WorldBorder;
|
package com.wimbli.WorldBorder;
|
||||||
|
|
||||||
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.LinkedHashSet;
|
import java.util.LinkedHashSet;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
|
import com.google.common.collect.ImmutableList;
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.entity.Boat;
|
import org.bukkit.entity.Boat;
|
||||||
import org.bukkit.entity.Entity;
|
import org.bukkit.entity.Entity;
|
||||||
|
@ -25,11 +28,11 @@ public class BorderCheckTask implements Runnable
|
||||||
if (Config.KnockBack() == 0.0)
|
if (Config.KnockBack() == 0.0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
Player[] players = Bukkit.getServer().getOnlinePlayers();
|
Collection players = ImmutableList.copyOf(Bukkit.getServer().getOnlinePlayers());
|
||||||
|
|
||||||
for (int i = 0; i < players.length; i++)
|
for (Object player : players)
|
||||||
{
|
{
|
||||||
checkPlayer(players[i], null, false, true);
|
checkPlayer((Player)player, null, false, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue