mirror of
https://github.com/EngineHub/WorldGuard.git
synced 2024-09-28 22:57:29 +02:00
Update for Spigot 1.8.
This commit is contained in:
parent
9cab51dac8
commit
a45fc45644
10
pom.xml
10
pom.xml
@ -79,7 +79,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sk89q</groupId>
|
<groupId>com.sk89q</groupId>
|
||||||
<artifactId>worldedit</artifactId>
|
<artifactId>worldedit</artifactId>
|
||||||
<version>5.5.8</version>
|
<version>6.0.0-SNAPSHOT</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
<type>jar</type>
|
<type>jar</type>
|
||||||
</dependency>
|
</dependency>
|
||||||
@ -105,9 +105,9 @@
|
|||||||
<!-- End runtime only -->
|
<!-- End runtime only -->
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.bukkit</groupId>
|
<groupId>com.sk89q.spigot</groupId>
|
||||||
<artifactId>bukkit</artifactId>
|
<artifactId>bukkit</artifactId>
|
||||||
<version>1.7.2-R0.3</version>
|
<version>1.8-R0.1-SNAPSHOT</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
<type>jar</type>
|
<type>jar</type>
|
||||||
</dependency>
|
</dependency>
|
||||||
@ -141,8 +141,8 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.guava</groupId>
|
<groupId>com.google.guava</groupId>
|
||||||
<artifactId>guava</artifactId>
|
<artifactId>guava</artifactId>
|
||||||
<version>10.0.1</version> <!-- Bukkit only bundles 10.0.1 -->
|
<version>17.0</version>
|
||||||
<scope>compile</scope> <!-- required runtime dependency -->
|
<scope>compile</scope>
|
||||||
<type>jar</type>
|
<type>jar</type>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
@ -181,7 +181,7 @@ public boolean check(boolean useAsWhitelist, BlacklistEvent event, boolean force
|
|||||||
Cache<String, TrackedEvent> repeatingEventCache = blacklist.getRepeatingEventCache();
|
Cache<String, TrackedEvent> repeatingEventCache = blacklist.getRepeatingEventCache();
|
||||||
|
|
||||||
// Check to see whether this event is being repeated
|
// Check to see whether this event is being repeated
|
||||||
TrackedEvent tracked = repeatingEventCache.getUnchecked(eventCacheKey);
|
TrackedEvent tracked = repeatingEventCache.getIfPresent(eventCacheKey);
|
||||||
if (tracked.matches(event)) {
|
if (tracked.matches(event)) {
|
||||||
repeating = true;
|
repeating = true;
|
||||||
} else {
|
} else {
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
import com.google.common.base.Predicate;
|
import com.google.common.base.Predicate;
|
||||||
import com.google.common.base.Predicates;
|
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 com.sk89q.worldedit.blocks.ItemType;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@ -76,22 +76,22 @@ private Predicate<Short> parseRange(String input) throws TargetMatcherParseExcep
|
|||||||
|
|
||||||
matcher = LESS_THAN_PATTERN.matcher(input);
|
matcher = LESS_THAN_PATTERN.matcher(input);
|
||||||
if (matcher.matches()) {
|
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);
|
matcher = GREATER_THAN_PATTERN.matcher(input);
|
||||||
if (matcher.matches()) {
|
if (matcher.matches()) {
|
||||||
return Ranges.atLeast(Short.parseShort(matcher.group(1)));
|
return Range.atLeast(Short.parseShort(matcher.group(1)));
|
||||||
}
|
}
|
||||||
|
|
||||||
matcher = RANGE_PATTERN.matcher(input);
|
matcher = RANGE_PATTERN.matcher(input);
|
||||||
if (matcher.matches()) {
|
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 {
|
try {
|
||||||
short s = Short.parseShort(input);
|
short s = Short.parseShort(input);
|
||||||
return Ranges.closed(s, s);
|
return Range.closed(s, s);
|
||||||
} catch (NumberFormatException e) {
|
} catch (NumberFormatException e) {
|
||||||
throw new TargetMatcherParseException("Unknown data value range: " + input);
|
throw new TargetMatcherParseException("Unknown data value range: " + input);
|
||||||
}
|
}
|
||||||
|
@ -27,6 +27,7 @@
|
|||||||
import org.bukkit.World;
|
import org.bukkit.World;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
|
import java.util.Collection;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@ -61,7 +62,7 @@ public FlagStateManager(WorldGuardPlugin plugin) {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
Player[] players = plugin.getServer().getOnlinePlayers();
|
Collection<? extends Player> players = plugin.getServer().getOnlinePlayers();
|
||||||
ConfigurationManager config = plugin.getGlobalStateManager();
|
ConfigurationManager config = plugin.getGlobalStateManager();
|
||||||
|
|
||||||
for (Player player : players) {
|
for (Player player : players) {
|
||||||
|
@ -19,6 +19,18 @@
|
|||||||
|
|
||||||
package com.sk89q.worldguard.bukkit;
|
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.BufferedWriter;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileWriter;
|
import java.io.FileWriter;
|
||||||
@ -30,19 +42,6 @@
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
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 {
|
public class ReportWriter {
|
||||||
|
|
||||||
private static final SimpleDateFormat dateFmt =
|
private static final SimpleDateFormat dateFmt =
|
||||||
@ -165,7 +164,7 @@ private void appendServerInformation(Server server) {
|
|||||||
log.put("Implementation", server.getVersion());
|
log.put("Implementation", server.getVersion());
|
||||||
//log.put("Address", server.getIp(), server.getPort());
|
//log.put("Address", server.getIp(), server.getPort());
|
||||||
log.put("Player count", "%d/%d",
|
log.put("Player count", "%d/%d",
|
||||||
server.getOnlinePlayers().length, server.getMaxPlayers());
|
server.getOnlinePlayers().size(), server.getMaxPlayers());
|
||||||
|
|
||||||
append(log);
|
append(log);
|
||||||
appendln();
|
appendln();
|
||||||
|
@ -60,6 +60,7 @@
|
|||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
import java.util.Collection;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -426,7 +427,7 @@ public Player checkPlayer(CommandSender sender)
|
|||||||
* @return A {@link List} of players who match {@code filter}
|
* @return A {@link List} of players who match {@code filter}
|
||||||
*/
|
*/
|
||||||
public List<Player> matchPlayerNames(String filter) {
|
public List<Player> matchPlayerNames(String filter) {
|
||||||
Player[] players = getServer().getOnlinePlayers();
|
Collection<? extends Player> players = getServer().getOnlinePlayers();
|
||||||
|
|
||||||
filter = filter.toLowerCase();
|
filter = filter.toLowerCase();
|
||||||
|
|
||||||
@ -479,7 +480,7 @@ public List<Player> matchPlayerNames(String filter) {
|
|||||||
* @return {@code players} as an {@link Iterable}
|
* @return {@code players} as an {@link Iterable}
|
||||||
* @throws CommandException If {@code players} is empty
|
* @throws CommandException If {@code players} is empty
|
||||||
*/
|
*/
|
||||||
protected Iterable<Player> checkPlayerMatch(List<Player> players)
|
protected Iterable<Player> checkPlayerMatch(Collection<Player> players)
|
||||||
throws CommandException {
|
throws CommandException {
|
||||||
// Check to see if there were any matches
|
// Check to see if there were any matches
|
||||||
if (players.size() == 0) {
|
if (players.size() == 0) {
|
||||||
@ -507,12 +508,12 @@ protected Iterable<Player> checkPlayerMatch(List<Player> players)
|
|||||||
public Iterable<Player> matchPlayers(CommandSender source, String filter)
|
public Iterable<Player> matchPlayers(CommandSender source, String filter)
|
||||||
throws CommandException {
|
throws CommandException {
|
||||||
|
|
||||||
if (getServer().getOnlinePlayers().length == 0) {
|
if (getServer().getOnlinePlayers().isEmpty()) {
|
||||||
throw new CommandException("No players matched query.");
|
throw new CommandException("No players matched query.");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (filter.equals("*")) {
|
if (filter.equals("*")) {
|
||||||
return checkPlayerMatch(Arrays.asList(getServer().getOnlinePlayers()));
|
return checkPlayerMatch((Collection<Player>) getServer().getOnlinePlayers());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle special hash tag groups
|
// Handle special hash tag groups
|
||||||
@ -865,11 +866,9 @@ public RegionManager getRegionManager(World world) {
|
|||||||
* @return The message with macros replaced
|
* @return The message with macros replaced
|
||||||
*/
|
*/
|
||||||
public String replaceMacros(CommandSender sender, String message) {
|
public String replaceMacros(CommandSender sender, String message) {
|
||||||
Player[] online = getServer().getOnlinePlayers();
|
|
||||||
|
|
||||||
message = message.replace("%name%", toName(sender));
|
message = message.replace("%name%", toName(sender));
|
||||||
message = message.replace("%id%", toUniqueName(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) {
|
if (sender instanceof Player) {
|
||||||
Player player = (Player) sender;
|
Player player = (Player) sender;
|
||||||
|
Loading…
Reference in New Issue
Block a user