Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2025-02-10 17:31:20 +01:00
Code Issues Projects Releases Wiki Activity

Move StringMatcher to before other things

Browse Source
This commit is contained in:
Matthew Miller 2018-12-29 12:38:45 +10:00
parent 405b210fb5
commit b48e145508
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitStringMatcher.java
View File

@ -28,7 +28,6 @@
import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.World;
import com.sk89q.worldguard.LocalPlayer; import com.sk89q.worldguard.LocalPlayer;
import com.sk89q.worldguard.WorldGuard; import com.sk89q.worldguard.WorldGuard;
import com.sk89q.worldguard.commands.CommandUtils;
import com.sk89q.worldguard.internal.platform.StringMatcher; import com.sk89q.worldguard.internal.platform.StringMatcher;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

2
worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitWorldGuardPlatform.java
View File

@ -102,13 +102,13 @@ public void broadcastNotification(String message) {
@Override @Override
public void load() { public void load() {
stringMatcher = new BukkitStringMatcher();
sessionManager = new BukkitSessionManager(); sessionManager = new BukkitSessionManager();
configuration = new BukkitConfigurationManager(WorldGuardPlugin.inst()); configuration = new BukkitConfigurationManager(WorldGuardPlugin.inst());
configuration.load(); configuration.load();
regionContainer = new BukkitRegionContainer(WorldGuardPlugin.inst()); regionContainer = new BukkitRegionContainer(WorldGuardPlugin.inst());
regionContainer.initialize(); regionContainer.initialize();
debugHandler = new BukkitDebugHandler(WorldGuardPlugin.inst()); debugHandler = new BukkitDebugHandler(WorldGuardPlugin.inst());
stringMatcher = new BukkitStringMatcher();
} }
@Override @Override

3
worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/AbstractListener.java
View File

@ -24,7 +24,6 @@
import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.World;
import com.sk89q.worldguard.LocalPlayer; import com.sk89q.worldguard.LocalPlayer;
import com.sk89q.worldguard.WorldGuard; import com.sk89q.worldguard.WorldGuard;
import com.sk89q.worldguard.bukkit.BukkitWorldConfiguration;
import com.sk89q.worldguard.bukkit.WorldGuardPlugin; import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
import com.sk89q.worldguard.config.ConfigurationManager; import com.sk89q.worldguard.config.ConfigurationManager;
import com.sk89q.worldguard.config.WorldConfiguration; import com.sk89q.worldguard.config.WorldConfiguration;
@ -86,7 +85,7 @@ protected WorldConfiguration getWorldConfig(World world) {
* Get the world configuration given a player. * Get the world configuration given a player.
* *
* @param player The player to get the wold from * @param player The player to get the wold from
* @return The {@link BukkitWorldConfiguration} for the player's world * @return The {@link WorldConfiguration} for the player's world
*/ */
protected WorldConfiguration getWorldConfig(LocalPlayer player) { protected WorldConfiguration getWorldConfig(LocalPlayer player) {
return getWorldConfig((World) player.getExtent()); return getWorldConfig((World) player.getExtent());