Skip to content

Commit

Permalink
Added spectator game mode check. Added new onJoin event listener. Add…
Browse files Browse the repository at this point in the history
…ed new config.yml variable `defaultJoinTrailStringName: "ColoredRedDust"`. Added new default trail on join system. Added new permission node `trailgui.*`. Added new permission node `trailgui.bypass.*`. Added new permission node `trailgui.bypass.jointrail. Changed plugin version to `6.16.4-CUSTOM`.
  • Loading branch information
Loving11ish committed Nov 30, 2023
1 parent 91941fb commit cc53b82
Show file tree
Hide file tree
Showing 4 changed files with 678 additions and 624 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ca.jamiesinn</groupId>
<artifactId>TrailGUI</artifactId>
<version>6.16.3-CUSTOM</version>
<version>6.16.4-CUSTOM</version>

<properties>
<java.version>11</java.version>
Expand Down
35 changes: 35 additions & 0 deletions src/main/java/ca/jamiesinn/trailgui/Listeners.java
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
package ca.jamiesinn.trailgui;

import ca.jamiesinn.trailgui.trails.Trail;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.inventory.ItemStack;

import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.UUID;

public class Listeners implements Listener
{
Expand Down Expand Up @@ -147,6 +153,10 @@ public void onPlayerMove(PlayerMoveEvent event)
return;
}

if (player.getGameMode().equals(GameMode.SPECTATOR)) {
return;
}

List<Trail> trails = TrailGUI.enabledTrails.get(player.getUniqueId());
try
{
Expand All @@ -161,6 +171,31 @@ public void onPlayerMove(PlayerMoveEvent event)
}
}

@EventHandler
public void onJoin(PlayerJoinEvent event) {

final Player player = event.getPlayer();

if (player.hasPermission("trailgui.bypass.jointrail")
||player.hasPermission("trailgui.bypass.*")
||player.hasPermission("trailgui.*")) {
return;
}

String defaultTrailType = TrailGUI.getPlugin().getConfig().getString("defaultJoinTrailStringName", "ColoredRedDust");

if (defaultTrailType.equals("none")) {
return;
}

List<Trail> trailTypes = new ArrayList<>();

trailTypes.add(TrailGUI.trailTypes.get(defaultTrailType));

Trail.enableEvent(Bukkit.getPlayer(player.getUniqueId()), trailTypes);
TrailGUI.enabledTrails.put(player.getUniqueId(), trailTypes);
}

@EventHandler
public void onLogout(PlayerQuitEvent e)
{
Expand Down
3 changes: 3 additions & 0 deletions src/main/resources/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ oneTrailAtATime: false
#Max number of concurrently equipped trails - Only used if the above is false - use 0 for no limit
maxActiveTrails: 0

#Set below the default trail to apply on player join. Set to "none" to disable. (default: "ColoredRedDust")
defaultJoinTrailStringName: "ColoredRedDust"

############################################################
# +------------------------------------------------------+ #
# | Configuration: GUI | #
Expand Down
Loading

0 comments on commit cc53b82

Please sign in to comment.