Altitude/AlttdGriefPrevention
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to 1.18.2

Browse Source
This commit is contained in:
destro174 2022-03-14 14:19:51 +01:00
parent 61769160ab
commit 0c041cdf1b
3 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -149,7 +149,7 @@
<dependency>
<groupId>com.alttd</groupId>
<artifactId>Galaxy-API</artifactId>
<version>1.18.1-R0.1-SNAPSHOT</version>
<version>1.18.2-R0.1-SNAPSHOT</version>
</dependency>
<!-- Worldguard dependency -->
<dependency>

26
src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java
View File

@ -26,10 +26,12 @@ import me.ryanhamshire.GriefPrevention.alttd.listeners.AltitudeListener;
import me.ryanhamshire.GriefPrevention.alttd.tasks.AdminClaimExpireTask;
import me.ryanhamshire.GriefPrevention.alttd.tasks.IgnoreClaimWarningTask;
import me.ryanhamshire.GriefPrevention.alttd.util.SafeZone;
import me.ryanhamshire.GriefPrevention.alttd.util.Utils;
import me.ryanhamshire.GriefPrevention.events.PreventBlockBreakEvent;
import me.ryanhamshire.GriefPrevention.events.SaveTrappedPlayerEvent;
import me.ryanhamshire.GriefPrevention.events.TrustChangedEvent;
import net.kyori.adventure.text.minimessage.Template;
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.ComponentBuilder;
import net.md_5.bungee.api.chat.HoverEvent;
@ -2470,13 +2472,13 @@ public class GriefPrevention extends JavaPlugin
player.sendMiniMessage(Config.PlayerNotSpecified, null); // todo placeholders.
return true;
}
List<Template> templates = new ArrayList<>(List.of(
Template.template("target", args[0]),
Template.template("player", player.name())
));
TagResolver placeholders = TagResolver.resolver(
Placeholder.component("player", player.name()),
Placeholder.parsed("target", args[0])
);
Player target = Bukkit.getPlayer(args[0]);
if (target == null) {
player.sendMiniMessage(Config.PlayerOffline, templates); // todo placeholders.
player.sendMiniMessage(Config.PlayerOffline, placeholders); // todo placeholders.
return true;
}
if (player.equals(target)) {
@ -2485,18 +2487,18 @@ public class GriefPrevention extends JavaPlugin
}
Claim claim = this.dataStore.getClaimAt(target.getLocation(), true, null);
if (claim == null || (claim.checkPermission(player, ClaimPermission.Manage, null) != null)) {
player.sendMiniMessage(Config.TargetNotInClaim, templates); // todo placeholders.
player.sendMiniMessage(Config.TargetNotInClaim, placeholders); // todo placeholders.
return true;
}
templates.add(Template.template("claim_owner", claim.getOwnerName()));
placeholders = TagResolver.resolver(placeholders, Placeholder.parsed("claim_owner", claim.getOwnerName()));
SafeZone zone = new SafeZone(claim);
if ((target.hasPermission("griefprevention.adminclaims") && claim.isAdminClaim()) || zone
.hasTrust(target.getUniqueId())) {
player.sendMiniMessage(Config.CannotKickTrustedTarget, templates); // todo placeholders.
player.sendMiniMessage(Config.CannotKickTrustedTarget, placeholders); // todo placeholders.
return true;
}
if (target.hasPermission("griefprevention.kickfromclaimexempt")) {
player.sendMiniMessage(Config.CannotKickExemptTarget, templates); // todo placeholders.
player.sendMiniMessage(Config.CannotKickExemptTarget, placeholders); // todo placeholders.
return true;
}
zone.testForSafeSpot();
@ -2507,8 +2509,8 @@ public class GriefPrevention extends JavaPlugin
if (target.isInsideVehicle()) target.leaveVehicle();
target.teleport(safe);
Bukkit.getPluginManager().callEvent(new PlayerTeleportEvent(target, safe, safe));
player.sendMiniMessage(Config.KickSuccess, templates); // todo placeholders.
target.sendMiniMessage(Config.KickedFromClaim, templates); // todo placeholders.
player.sendMiniMessage(Config.KickSuccess, placeholders); // todo placeholders.
target.sendMiniMessage(Config.KickedFromClaim, placeholders); // todo placeholders.
}
return true;
}

14
src/main/java/me/ryanhamshire/GriefPrevention/alttd/tasks/IgnoreClaimWarningTask.java
View File

@ -5,8 +5,8 @@ import me.ryanhamshire.GriefPrevention.alttd.config.Config;
import me.ryanhamshire.GriefPrevention.alttd.util.Utils;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.minimessage.Template;
import net.kyori.adventure.text.minimessage.template.TemplateResolver;
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable;
@ -42,11 +42,11 @@ public class IgnoreClaimWarningTask extends BukkitRunnable
{
Player player = Bukkit.getPlayer(uuid);
if (player == null) return;
List<Template> templates = new ArrayList<>(List.of(
Template.template("player", player.name()),
Template.template("time", Utils.getPassedTime(time))
));
Component component = MiniMessage.miniMessage().deserialize(Config.ignoreClaimWarningMessage, TemplateResolver.templates(templates));
TagResolver placeholders = TagResolver.resolver(
Placeholder.component("player", player.name()),
Placeholder.parsed("time", Utils.getPassedTime(time))
);
Component component = MiniMessage.miniMessage().deserialize(Config.ignoreClaimWarningMessage, placeholders);
Bukkit.broadcast(component, Config.ignoreClaimWarningPermission);
player.sendMessage(component);
this.init();