Upstream/Advanced-Portals
1
0
Fork 0
mirror of https://github.com/sekwah41/Advanced-Portals.git synced 2025-02-16 04:11:29 +01:00
Code Issues Projects Releases Wiki Activity

refactor: use container API (#515)

Browse Source
This commit is contained in:
TreemanKing 2025-01-13 22:28:39 +11:00 committed by GitHub
parent 225160f523
commit 5cca6673bb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
spigot/src/main/java/com/sekwah/advancedportals/spigot/tags/ConditionsTag.java
View File

@ -7,8 +7,8 @@ import com.sekwah.advancedportals.core.util.Lang;
import com.sekwah.advancedportals.core.warphandler.ActivationData;
import com.sekwah.advancedportals.core.warphandler.Tag;
import com.sekwah.advancedportals.shadowed.inject.Inject;
import com.sekwah.advancedportals.spigot.connector.container.SpigotPlayerContainer;
import me.clip.placeholderapi.PlaceholderAPI;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
public class ConditionsTag implements Tag.Activation, Tag.Split, Tag.Creation {
@ -19,12 +19,17 @@ public class ConditionsTag implements Tag.Activation, Tag.Split, Tag.Creation {
public boolean preActivated(TagTarget target, PlayerContainer player,
ActivationData activeData, String[] argData) {
for (String condition : argData) {
if (!checkConditions(condition,
Bukkit.getPlayer(player.getUUID()))) {
player.sendMessage(Lang.getNegativePrefix()
+ Lang.translate("tag.conditions.fail"));
return false;
if (player instanceof SpigotPlayerContainer) {
SpigotPlayerContainer spigotPlayer = (SpigotPlayerContainer) player;
if (!checkConditions(condition,
spigotPlayer.getPlayer())) {
spigotPlayer.sendMessage(Lang.getNegativePrefix()
+ Lang.translate("tag.conditions.fail"));
return false;
}
}
}
return true;
@ -142,18 +147,22 @@ public class ConditionsTag implements Tag.Activation, Tag.Split, Tag.Creation {
@Override
public boolean created(TagTarget target, PlayerContainer player, String[] argData) {
for (String condition : argData) {
if (!checkConditions(
condition,
Bukkit.getPlayer(player.getUUID()))) {
player.sendMessage(
Lang.getNegativePrefix()
+ Lang.translate("tag.conditions.invalid"));
return false;
}
}
return true;
if (player instanceof SpigotPlayerContainer) {
SpigotPlayerContainer spigotPlayer = (SpigotPlayerContainer) player;
if (!checkConditions(
condition,
spigotPlayer.getPlayer())) {
spigotPlayer.sendMessage(
Lang.getNegativePrefix()
+ Lang.translate("tag.conditions.invalid"));
return false;
}
}
}
return true;
}
@Override
public void destroyed(TagTarget target, PlayerContainer player,
String[] argData) {