This commit is contained in:
NotMyFault 2021-07-30 01:31:25 +02:00
parent d62a1b5ad3
commit 678fb0a8b3
No known key found for this signature in database
GPG Key ID: 158F5701A6AAD00C
2 changed files with 3 additions and 3 deletions

View File

@ -99,7 +99,7 @@ dependencies {
} }
implementation("com.massivecraft:mcore:7.0.1") { isTransitive = false } implementation("com.massivecraft:mcore:7.0.1") { isTransitive = false }
implementation("com.bekvon.bukkit.residence:Residence:4.5._13.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("com.comphenix.protocol:ProtocolLib:4.7.0") { isTransitive = false }
implementation("org.incendo.serverlib:ServerLib:2.2.1") implementation("org.incendo.serverlib:ServerLib:2.2.1")
api("com.plotsquared:PlotSquared-Bukkit:6.0.6-SNAPSHOT") { isTransitive = false } api("com.plotsquared:PlotSquared-Bukkit:6.0.6-SNAPSHOT") { isTransitive = false }

View File

@ -2,12 +2,12 @@ package com.fastasyncworldedit.bukkit.regions;
import com.fastasyncworldedit.core.regions.FaweMask; import com.fastasyncworldedit.core.regions.FaweMask;
import com.palmergames.bukkit.towny.Towny; import com.palmergames.bukkit.towny.Towny;
import com.palmergames.bukkit.towny.TownyUniverse;
import com.palmergames.bukkit.towny.exceptions.NotRegisteredException; import com.palmergames.bukkit.towny.exceptions.NotRegisteredException;
import com.palmergames.bukkit.towny.object.PlayerCache; import com.palmergames.bukkit.towny.object.PlayerCache;
import com.palmergames.bukkit.towny.object.Resident; import com.palmergames.bukkit.towny.object.Resident;
import com.palmergames.bukkit.towny.object.Town; import com.palmergames.bukkit.towny.object.Town;
import com.palmergames.bukkit.towny.object.TownBlock; import com.palmergames.bukkit.towny.object.TownBlock;
import com.palmergames.bukkit.towny.object.TownyUniverse;
import com.palmergames.bukkit.towny.object.WorldCoord; import com.palmergames.bukkit.towny.object.WorldCoord;
import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.internal.util.LogManagerCompat; import com.sk89q.worldedit.internal.util.LogManagerCompat;
@ -38,7 +38,7 @@ public class TownyFeature extends BukkitMaskManager implements Listener {
} }
Resident resident; Resident resident;
try { try {
resident = TownyUniverse.getDataSource().getResident(player.getName()); resident = TownyUniverse.getInstance().getResident(player.getName());
try { try {
if (block.getResident().equals(resident)) { if (block.getResident().equals(resident)) {
return true; return true;