From 678fb0a8b34859f6e54a01c311a4393dd5416fcb Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Fri, 30 Jul 2021 01:31:25 +0200 Subject: [PATCH] Fixes #1201 --- worldedit-bukkit/build.gradle.kts | 2 +- .../com/fastasyncworldedit/bukkit/regions/TownyFeature.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/worldedit-bukkit/build.gradle.kts b/worldedit-bukkit/build.gradle.kts index dfe96dd17..3039cc9dc 100644 --- a/worldedit-bukkit/build.gradle.kts +++ b/worldedit-bukkit/build.gradle.kts @@ -99,7 +99,7 @@ dependencies { } implementation("com.massivecraft:mcore:7.0.1") { isTransitive = false } implementation("com.bekvon.bukkit.residence:Residence:4.5._13.1") { isTransitive = false } - implementation("com.palmergames.bukkit:towny:0.84.0.9") { isTransitive = false } + compileOnly("com.github.TownyAdvanced:Towny:0.97.0.17") { isTransitive = false } implementation("com.comphenix.protocol:ProtocolLib:4.7.0") { isTransitive = false } implementation("org.incendo.serverlib:ServerLib:2.2.1") api("com.plotsquared:PlotSquared-Bukkit:6.0.6-SNAPSHOT") { isTransitive = false } diff --git a/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/regions/TownyFeature.java b/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/regions/TownyFeature.java index 4ca8b76d0..231ee9ea3 100644 --- a/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/regions/TownyFeature.java +++ b/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/regions/TownyFeature.java @@ -2,12 +2,12 @@ package com.fastasyncworldedit.bukkit.regions; import com.fastasyncworldedit.core.regions.FaweMask; import com.palmergames.bukkit.towny.Towny; +import com.palmergames.bukkit.towny.TownyUniverse; import com.palmergames.bukkit.towny.exceptions.NotRegisteredException; import com.palmergames.bukkit.towny.object.PlayerCache; import com.palmergames.bukkit.towny.object.Resident; import com.palmergames.bukkit.towny.object.Town; import com.palmergames.bukkit.towny.object.TownBlock; -import com.palmergames.bukkit.towny.object.TownyUniverse; import com.palmergames.bukkit.towny.object.WorldCoord; import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.internal.util.LogManagerCompat; @@ -38,7 +38,7 @@ public class TownyFeature extends BukkitMaskManager implements Listener { } Resident resident; try { - resident = TownyUniverse.getDataSource().getResident(player.getName()); + resident = TownyUniverse.getInstance().getResident(player.getName()); try { if (block.getResident().equals(resident)) { return true;