TheDeusGroup/TFM-4.3-Reloaded
1
0
Fork 0
mirror of https://github.com/TheDeus-Group/TFM-4.3-Reloaded.git synced 2024-05-16 02:02:03 +00:00
Code Issues Projects Releases Wiki Activity

Fixes and improvements to the tag blocking process

Browse source 
This should fix the memory leak I suspect.
This commit is contained in:
Ryan Wild 2019-09-14 19:44:10 +01:00
parent c1c333eb5e
commit bc722b3b7b
4 changed files with 52 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java
View file

@ -13,6 +13,7 @@ import me.totalfreedom.totalfreedommod.blocking.InteractBlocker;
import me.totalfreedom.totalfreedommod.blocking.MobBlocker;
import me.totalfreedom.totalfreedommod.blocking.PotionBlocker;
import me.totalfreedom.totalfreedommod.blocking.command.CommandBlocker;
import me.totalfreedom.totalfreedommod.blocking.PlayerBlocker;
import me.totalfreedom.totalfreedommod.bridge.BukkitTelnetBridge;
import me.totalfreedom.totalfreedommod.bridge.EssentialsBridge;
import me.totalfreedom.totalfreedommod.bridge.LibsDisguisesBridge;
@ -97,6 +98,7 @@ public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
public Jumppads jp;
public Trailer tr;
public HTTPDaemon hd;
public PlayerBlocker plb;
//
// Bridges
public ServiceManager<TotalFreedomMod> bridges;
@ -197,6 +199,8 @@ public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
// HTTPD
hd = services.registerService(HTTPDaemon.class);
plb = services.registerService(PlayerBlocker.class);
// Start Services
services.start();
// Start bridges

44
src/main/java/me/totalfreedom/totalfreedommod/blocking/PlayerBlocker.java Normal file
View file

@ -0,0 +1,44 @@
package me.totalfreedom.totalfreedommod.blocking;
import com.google.common.collect.Lists;
import me.totalfreedom.totalfreedommod.FreedomService;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
import me.totalfreedom.totalfreedommod.util.FLog;
import me.totalfreedom.totalfreedommod.util.FUtil;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.inventory.ItemStack;
import java.util.Collection;
import java.util.List;
public class PlayerBlocker extends FreedomService
{
public static final List<String> blockedTags = Lists.newArrayList();
public PlayerBlocker(TotalFreedomMod plugin)
{
super(plugin);
}
@Override
protected void onStart()
{
// Load banned tags
blockedTags.clear();
blockedTags.addAll((Collection<? extends String>) ConfigEntry.BLOCKED_TAGS.getList());
FLog.info("Loaded " + blockedTags.size() + " banned tags.");
}
@Override
protected void onStop()
{
}
}

11
src/main/java/me/totalfreedom/totalfreedommod/command/Command_tag.java
View file

@ -5,6 +5,7 @@ import java.util.Collection;
import java.util.List;
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
import me.totalfreedom.totalfreedommod.player.FPlayer;
import me.totalfreedom.totalfreedommod.blocking.PlayerBlocker;
import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FLog;
import me.totalfreedom.totalfreedommod.util.FUtil;
@ -19,18 +20,10 @@ import org.bukkit.entity.Player;
public class Command_tag extends FreedomCommand
{
public final List<String> FORBIDDEN_WORDS = Lists.newArrayList();
@Override
public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{
// Load unbannable usernames
FORBIDDEN_WORDS.clear();
FORBIDDEN_WORDS.addAll((Collection<? extends String>) ConfigEntry.BLOCKED_TAGS.getList());
FLog.info("Loaded " + FORBIDDEN_WORDS.size() + " forbidden tags.");
if (args.length == 1)
{
if ("list".equalsIgnoreCase(args[0]))
@ -138,7 +131,7 @@ public class Command_tag extends FreedomCommand
return true;
}
for (String word : FORBIDDEN_WORDS)
for (String word : PlayerBlocker.blockedTags)
{
if (rawTag.contains(word))
{

3
src/main/java/me/totalfreedom/totalfreedommod/command/Command_tagnyan.java
View file

@ -1,5 +1,6 @@
package me.totalfreedom.totalfreedommod.command;
import me.totalfreedom.totalfreedommod.blocking.PlayerBlocker;
import me.totalfreedom.totalfreedommod.player.FPlayer;
import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil;
@ -30,7 +31,7 @@ public class Command_tagnyan extends FreedomCommand
}
String tagStr = tag.toString();
for (String word : Command_tag.FORBIDDEN_WORDS)
for (String word : PlayerBlocker.blockedTags)
{
if (tagStr.contains(word))
{