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

Stop passing LiteFlags to every object when they don't use it.

Browse Source 
Changed .replaceFirst to .replace so that it doesn't try to use regex and breaks when things like $ is passed into it
This commit is contained in:
Sti-jn 2021-04-09 16:07:00 +02:00
parent b235928089
commit eb2b1bf5f7
4 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -14,7 +14,7 @@
</properties> </properties>
<build> <build>
<finalName>${project.artifactId}</finalName> <finalName>${project.artifactId}</finalName>
<defaultGoal>clean package install</defaultGoal> <defaultGoal>clean package</defaultGoal>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

12
src/main/java/com/liteflags/LiteFlags.java
View File

@ -18,12 +18,12 @@ public class LiteFlags extends JavaPlugin {
public void onEnable() { public void onEnable() {
instance = this; instance = this;
this.saveDefaultConfig(); this.saveDefaultConfig();
this.getCommand("flag").setExecutor(new FlagCMD(this)); this.getCommand("flag").setExecutor(new FlagCMD());
this.getCommand("flaglist").setExecutor(new FlagCMD(this)); this.getCommand("flaglist").setExecutor(new FlagCMD());
this.getServer().getPluginManager().registerEvents(new LoginEvent(this), this); this.getServer().getPluginManager().registerEvents(new LoginEvent(), this);
this.getServer().getPluginManager().registerEvents(new LogoutEvent(this), this); this.getServer().getPluginManager().registerEvents(new LogoutEvent(), this);
this.getServer().getPluginManager().registerEvents(new ChatEvent(this), this); this.getServer().getPluginManager().registerEvents(new ChatEvent(), this);
this.getServer().getPluginManager().registerEvents(new MoveEvent(this), this); this.getServer().getPluginManager().registerEvents(new MoveEvent(), this);
try { try {
DatabaseConnection var10000 = this.database; DatabaseConnection var10000 = this.database;

25
src/main/java/com/liteflags/commands/FlagCMD.java
View File

@ -27,11 +27,6 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class FlagCMD implements CommandExecutor { public class FlagCMD implements CommandExecutor {
private LiteFlags flags;
public FlagCMD(LiteFlags flags) {
this.flags = flags;
}
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
OfflinePlayer target; OfflinePlayer target;
@ -234,22 +229,22 @@ public class FlagCMD implements CommandExecutor {
} }
String s = (String) var20.next(); String s = (String) var20.next();
s = s.replaceFirst("%player%", targetPlayer.getName()); s = s.replace("%player%", targetPlayer.getName());
s = s.replaceFirst("%staff%", flaggedBy); s = s.replace("%staff%", flaggedBy);
s = s.replaceFirst("%flaglength%", flagLength); s = s.replace("%flaglength%", flagLength);
s = s.replaceFirst("%reason%", reason); s = s.replace("%reason%", reason);
s = s.replaceFirst("%flagtime%", Utilities.convertTime(convertedFlaggedTime)); s = s.replace("%flagtime%", Utilities.convertTime(convertedFlaggedTime));
if (expireTime != 0L) { if (expireTime != 0L) {
s = s.replaceFirst("%expiretime%", Utilities.convertTime(convertedExpireTime)); s = s.replace("%expiretime%", Utilities.convertTime(convertedExpireTime));
} }
s = s.replaceFirst("%limit%", "" + Database.countFlags(targetPlayer.getUniqueId())); s = s.replace("%limit%", "" + Database.countFlags(targetPlayer.getUniqueId()));
s = s.replaceFirst("%nl%", " "); s = s.replace("%nl%", " ");
if (convertedExpireTime < 0 && expireTime != 0L) { if (convertedExpireTime < 0 && expireTime != 0L) {
s = s.replaceFirst("%active%", LiteFlags.getInstance().getConfig().getString("Messages.ExpiredFlags")); s = s.replace("%active%", LiteFlags.getInstance().getConfig().getString("Messages.ExpiredFlags"));
mainComponent = new TextComponent(Utilities.format(s)); mainComponent = new TextComponent(Utilities.format(s));
} else { } else {
s = s.replaceFirst("%active%", LiteFlags.getInstance().getConfig().getString("Messages.ActiveFlags")); s = s.replace("%active%", LiteFlags.getInstance().getConfig().getString("Messages.ActiveFlags"));
mainComponent = new TextComponent(Utilities.format(s)); mainComponent = new TextComponent(Utilities.format(s));
} }

5
src/main/java/com/liteflags/events/LogoutEvent.java
View File

@ -10,11 +10,6 @@ import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerQuitEvent;
public class LogoutEvent implements Listener { public class LogoutEvent implements Listener {
private LiteFlags flags;
public LogoutEvent(LiteFlags flags) {
this.flags = flags;
}
@EventHandler @EventHandler
public void onPlayerLogout(PlayerQuitEvent e) { public void onPlayerLogout(PlayerQuitEvent e) {