From a45fc45644c689064a3fa96c2f832a1c59c8bf7e Mon Sep 17 00:00:00 2001 From: sk89q Date: Fri, 28 Nov 2014 19:31:43 -0800 Subject: [PATCH] Update for Spigot 1.8. --- pom.xml | 10 +++---- .../worldguard/blacklist/BlacklistEntry.java | 2 +- .../blacklist/target/TargetMatcherParser.java | 10 +++---- .../worldguard/bukkit/FlagStateManager.java | 3 ++- .../sk89q/worldguard/bukkit/ReportWriter.java | 27 +++++++++---------- .../worldguard/bukkit/WorldGuardPlugin.java | 13 +++++---- 6 files changed, 32 insertions(+), 33 deletions(-) diff --git a/pom.xml b/pom.xml index c73fa8ff..1ad54bf8 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ com.sk89q worldedit - 5.5.8 + 6.0.0-SNAPSHOT compile jar @@ -105,9 +105,9 @@ - org.bukkit + com.sk89q.spigot bukkit - 1.7.2-R0.3 + 1.8-R0.1-SNAPSHOT compile jar @@ -141,8 +141,8 @@ com.google.guava guava - 10.0.1 - compile + 17.0 + compile jar diff --git a/src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java b/src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java index 9ed29a42..ab2ebbdb 100644 --- a/src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java +++ b/src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java @@ -181,7 +181,7 @@ public boolean check(boolean useAsWhitelist, BlacklistEvent event, boolean force Cache repeatingEventCache = blacklist.getRepeatingEventCache(); // Check to see whether this event is being repeated - TrackedEvent tracked = repeatingEventCache.getUnchecked(eventCacheKey); + TrackedEvent tracked = repeatingEventCache.getIfPresent(eventCacheKey); if (tracked.matches(event)) { repeating = true; } else { diff --git a/src/main/java/com/sk89q/worldguard/blacklist/target/TargetMatcherParser.java b/src/main/java/com/sk89q/worldguard/blacklist/target/TargetMatcherParser.java index deba9b7a..05005e14 100644 --- a/src/main/java/com/sk89q/worldguard/blacklist/target/TargetMatcherParser.java +++ b/src/main/java/com/sk89q/worldguard/blacklist/target/TargetMatcherParser.java @@ -21,7 +21,7 @@ import com.google.common.base.Predicate; import com.google.common.base.Predicates; -import com.google.common.collect.Ranges; +import com.google.common.collect.Range; import com.sk89q.worldedit.blocks.ItemType; import java.util.ArrayList; @@ -76,22 +76,22 @@ private Predicate parseRange(String input) throws TargetMatcherParseExcep matcher = LESS_THAN_PATTERN.matcher(input); if (matcher.matches()) { - return Ranges.atMost(Short.parseShort(matcher.group(1))); + return Range.atMost(Short.parseShort(matcher.group(1))); } matcher = GREATER_THAN_PATTERN.matcher(input); if (matcher.matches()) { - return Ranges.atLeast(Short.parseShort(matcher.group(1))); + return Range.atLeast(Short.parseShort(matcher.group(1))); } matcher = RANGE_PATTERN.matcher(input); if (matcher.matches()) { - return Ranges.closed(Short.parseShort(matcher.group(1)), Short.parseShort(matcher.group(2))); + return Range.closed(Short.parseShort(matcher.group(1)), Short.parseShort(matcher.group(2))); } try { short s = Short.parseShort(input); - return Ranges.closed(s, s); + return Range.closed(s, s); } catch (NumberFormatException e) { throw new TargetMatcherParseException("Unknown data value range: " + input); } diff --git a/src/main/java/com/sk89q/worldguard/bukkit/FlagStateManager.java b/src/main/java/com/sk89q/worldguard/bukkit/FlagStateManager.java index 9988a155..04e46db1 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/FlagStateManager.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/FlagStateManager.java @@ -27,6 +27,7 @@ import org.bukkit.World; import org.bukkit.entity.Player; +import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -61,7 +62,7 @@ public FlagStateManager(WorldGuardPlugin plugin) { */ @Override public void run() { - Player[] players = plugin.getServer().getOnlinePlayers(); + Collection players = plugin.getServer().getOnlinePlayers(); ConfigurationManager config = plugin.getGlobalStateManager(); for (Player player : players) { diff --git a/src/main/java/com/sk89q/worldguard/bukkit/ReportWriter.java b/src/main/java/com/sk89q/worldguard/bukkit/ReportWriter.java index c25d234f..af8caaa0 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/ReportWriter.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/ReportWriter.java @@ -19,6 +19,18 @@ package com.sk89q.worldguard.bukkit; +import com.sk89q.worldguard.protection.GlobalRegionManager; +import com.sk89q.worldguard.protection.flags.DefaultFlag; +import com.sk89q.worldguard.protection.flags.Flag; +import com.sk89q.worldguard.protection.flags.StateFlag; +import com.sk89q.worldguard.protection.managers.RegionManager; +import com.sk89q.worldguard.protection.regions.ProtectedRegion; +import com.sk89q.worldguard.util.LogListBlock; +import org.bukkit.Server; +import org.bukkit.World; +import org.bukkit.entity.Entity; +import org.bukkit.plugin.Plugin; + import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; @@ -30,19 +42,6 @@ import java.util.List; import java.util.Map; -import org.bukkit.Server; -import org.bukkit.World; -import org.bukkit.entity.Entity; -import org.bukkit.plugin.Plugin; - -import com.sk89q.worldguard.protection.GlobalRegionManager; -import com.sk89q.worldguard.protection.flags.DefaultFlag; -import com.sk89q.worldguard.protection.flags.Flag; -import com.sk89q.worldguard.protection.flags.StateFlag; -import com.sk89q.worldguard.protection.managers.RegionManager; -import com.sk89q.worldguard.protection.regions.ProtectedRegion; -import com.sk89q.worldguard.util.LogListBlock; - public class ReportWriter { private static final SimpleDateFormat dateFmt = @@ -165,7 +164,7 @@ private void appendServerInformation(Server server) { log.put("Implementation", server.getVersion()); //log.put("Address", server.getIp(), server.getPort()); log.put("Player count", "%d/%d", - server.getOnlinePlayers().length, server.getMaxPlayers()); + server.getOnlinePlayers().size(), server.getMaxPlayers()); append(log); appendln(); diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java index e1112f71..7419cf25 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java @@ -60,6 +60,7 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.Set; @@ -426,7 +427,7 @@ public Player checkPlayer(CommandSender sender) * @return A {@link List} of players who match {@code filter} */ public List matchPlayerNames(String filter) { - Player[] players = getServer().getOnlinePlayers(); + Collection players = getServer().getOnlinePlayers(); filter = filter.toLowerCase(); @@ -479,7 +480,7 @@ public List matchPlayerNames(String filter) { * @return {@code players} as an {@link Iterable} * @throws CommandException If {@code players} is empty */ - protected Iterable checkPlayerMatch(List players) + protected Iterable checkPlayerMatch(Collection players) throws CommandException { // Check to see if there were any matches if (players.size() == 0) { @@ -507,12 +508,12 @@ protected Iterable checkPlayerMatch(List players) public Iterable matchPlayers(CommandSender source, String filter) throws CommandException { - if (getServer().getOnlinePlayers().length == 0) { + if (getServer().getOnlinePlayers().isEmpty()) { throw new CommandException("No players matched query."); } if (filter.equals("*")) { - return checkPlayerMatch(Arrays.asList(getServer().getOnlinePlayers())); + return checkPlayerMatch((Collection) getServer().getOnlinePlayers()); } // Handle special hash tag groups @@ -865,11 +866,9 @@ public RegionManager getRegionManager(World world) { * @return The message with macros replaced */ public String replaceMacros(CommandSender sender, String message) { - Player[] online = getServer().getOnlinePlayers(); - message = message.replace("%name%", toName(sender)); message = message.replace("%id%", toUniqueName(sender)); - message = message.replace("%online%", String.valueOf(online.length)); + message = message.replace("%online%", String.valueOf(getServer().getOnlinePlayers().size())); if (sender instanceof Player) { Player player = (Player) sender;