Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
aa52dcdf94 | ||
|
|
9d3ba7ea88 |
@@ -13,7 +13,7 @@ dependencies {
|
|||||||
compileOnly 'com.github.TechFortress:GriefPrevention:16.14.0'
|
compileOnly 'com.github.TechFortress:GriefPrevention:16.14.0'
|
||||||
compileOnly 'com.massivecraft:Factions:1.6.9.5-U0.5.10'
|
compileOnly 'com.massivecraft:Factions:1.6.9.5-U0.5.10'
|
||||||
compileOnly 'com.github.cryptomorin:kingdoms:1.10.14'
|
compileOnly 'com.github.cryptomorin:kingdoms:1.10.14'
|
||||||
compileOnly 'com.github.TownyAdvanced:Towny:0.96.2.0'
|
compileOnly 'com.github.TownyAdvanced:Towny:0.97.1.0'
|
||||||
compileOnly 'com.github.angeschossen:LandsAPI:4.7.3'
|
compileOnly 'com.github.angeschossen:LandsAPI:4.7.3'
|
||||||
compileOnly 'fr.neatmonster:nocheatplus:3.16.1-SNAPSHOT'
|
compileOnly 'fr.neatmonster:nocheatplus:3.16.1-SNAPSHOT'
|
||||||
compileOnly 'com.github.jiangdashao:matrix-api-repo:317d4635fd'
|
compileOnly 'com.github.jiangdashao:matrix-api-repo:317d4635fd'
|
||||||
|
|||||||
@@ -2,9 +2,7 @@ package com.willfp.eco.spigot.integrations.antigrief
|
|||||||
|
|
||||||
import com.palmergames.bukkit.towny.TownyAPI
|
import com.palmergames.bukkit.towny.TownyAPI
|
||||||
import com.palmergames.bukkit.towny.TownyUniverse
|
import com.palmergames.bukkit.towny.TownyUniverse
|
||||||
import com.palmergames.bukkit.towny.`object`.Town
|
|
||||||
import com.palmergames.bukkit.towny.`object`.TownyPermission
|
import com.palmergames.bukkit.towny.`object`.TownyPermission
|
||||||
import com.palmergames.bukkit.towny.`object`.WorldCoord
|
|
||||||
import com.palmergames.bukkit.towny.utils.PlayerCacheUtil
|
import com.palmergames.bukkit.towny.utils.PlayerCacheUtil
|
||||||
import com.willfp.eco.core.integrations.antigrief.AntigriefWrapper
|
import com.willfp.eco.core.integrations.antigrief.AntigriefWrapper
|
||||||
import org.bukkit.Location
|
import org.bukkit.Location
|
||||||
@@ -67,22 +65,8 @@ class AntigriefTowny : AntigriefWrapper {
|
|||||||
true
|
true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (victim is Player) {
|
val townBlock = TownyAPI.getInstance().getTownBlock(victim.location) ?: return true
|
||||||
try {
|
return townBlock.permissions.pvp
|
||||||
val town: Town = WorldCoord.parseWorldCoord(victim.getLocation()).townBlock.town
|
|
||||||
return town.isPVP
|
|
||||||
} catch (ignored: Exception) {
|
|
||||||
// If exception, no town was found, thus return true.
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
try {
|
|
||||||
val town: Town = WorldCoord.parseWorldCoord(victim.location).townBlock.town
|
|
||||||
return town.hasMobs()
|
|
||||||
} catch (ignored: Exception) {
|
|
||||||
// If exception, no town was found, thus return true.
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getPluginName(): String {
|
override fun getPluginName(): String {
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
version = 6.8.1
|
version = 6.8.2
|
||||||
plugin-name = eco
|
plugin-name = eco
|
||||||
Reference in New Issue
Block a user