Skip to content

Commit cc53b82

Browse files
committed
Added spectator game mode check. Added new onJoin event listener. Added 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`.
1 parent 91941fb commit cc53b82

File tree

4 files changed

+678
-624
lines changed

4 files changed

+678
-624
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<modelVersion>4.0.0</modelVersion>
77
<groupId>ca.jamiesinn</groupId>
88
<artifactId>TrailGUI</artifactId>
9-
<version>6.16.3-CUSTOM</version>
9+
<version>6.16.4-CUSTOM</version>
1010

1111
<properties>
1212
<java.version>11</java.version>

src/main/java/ca/jamiesinn/trailgui/Listeners.java

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
11
package ca.jamiesinn.trailgui;
22

33
import ca.jamiesinn.trailgui.trails.Trail;
4+
import org.bukkit.Bukkit;
5+
import org.bukkit.GameMode;
46
import org.bukkit.Material;
57
import org.bukkit.entity.Player;
68
import org.bukkit.event.EventHandler;
79
import org.bukkit.event.Listener;
810
import org.bukkit.event.entity.EntityDamageByEntityEvent;
911
import org.bukkit.event.inventory.InventoryClickEvent;
12+
import org.bukkit.event.player.PlayerJoinEvent;
1013
import org.bukkit.event.player.PlayerMoveEvent;
1114
import org.bukkit.event.player.PlayerQuitEvent;
1215
import org.bukkit.inventory.ItemStack;
1316

17+
import java.util.ArrayList;
1418
import java.util.List;
19+
import java.util.Objects;
20+
import java.util.UUID;
1521

1622
public class Listeners implements Listener
1723
{
@@ -147,6 +153,10 @@ public void onPlayerMove(PlayerMoveEvent event)
147153
return;
148154
}
149155

156+
if (player.getGameMode().equals(GameMode.SPECTATOR)) {
157+
return;
158+
}
159+
150160
List<Trail> trails = TrailGUI.enabledTrails.get(player.getUniqueId());
151161
try
152162
{
@@ -161,6 +171,31 @@ public void onPlayerMove(PlayerMoveEvent event)
161171
}
162172
}
163173

174+
@EventHandler
175+
public void onJoin(PlayerJoinEvent event) {
176+
177+
final Player player = event.getPlayer();
178+
179+
if (player.hasPermission("trailgui.bypass.jointrail")
180+
||player.hasPermission("trailgui.bypass.*")
181+
||player.hasPermission("trailgui.*")) {
182+
return;
183+
}
184+
185+
String defaultTrailType = TrailGUI.getPlugin().getConfig().getString("defaultJoinTrailStringName", "ColoredRedDust");
186+
187+
if (defaultTrailType.equals("none")) {
188+
return;
189+
}
190+
191+
List<Trail> trailTypes = new ArrayList<>();
192+
193+
trailTypes.add(TrailGUI.trailTypes.get(defaultTrailType));
194+
195+
Trail.enableEvent(Bukkit.getPlayer(player.getUniqueId()), trailTypes);
196+
TrailGUI.enabledTrails.put(player.getUniqueId(), trailTypes);
197+
}
198+
164199
@EventHandler
165200
public void onLogout(PlayerQuitEvent e)
166201
{

src/main/resources/config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ oneTrailAtATime: false
4747
#Max number of concurrently equipped trails - Only used if the above is false - use 0 for no limit
4848
maxActiveTrails: 0
4949

50+
#Set below the default trail to apply on player join. Set to "none" to disable. (default: "ColoredRedDust")
51+
defaultJoinTrailStringName: "ColoredRedDust"
52+
5053
############################################################
5154
# +------------------------------------------------------+ #
5255
# | Configuration: GUI | #

0 commit comments

Comments
 (0)