AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-11-27 01:05:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #280 from CoolJWB/development

Browse Source 
Potion command fix & performance
This commit is contained in:
CoolJWB 2020-09-06 21:28:22 +02:00 committed by GitHub
commit 451ef8f009
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 179 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/me/totalfreedom/totalfreedommod/bridge/FAWEBridge.java
View File

@ -12,11 +12,14 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import me.totalfreedom.totalfreedommod.FreedomService;
import net.coreprotect.CoreProtect;
import net.coreprotect.CoreProtectAPI;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.block.BlockState;
import org.bukkit.block.data.BlockData;
public class FAWEBridge extends FreedomService
@ -29,7 +32,7 @@ public class FAWEBridge extends FreedomService
@Override
public void onStart()
{
api = plugin.cpb.getCoreProtectAPI();
api = ((CoreProtect)Bukkit.getPluginManager().getPlugin("CoreProtect")).getAPI();
/*
* Iterates over blocks placed by GenerationCommands (in the EditSession) and adds them to the CoreProtect logs.
@ -127,7 +130,12 @@ public class FAWEBridge extends FreedomService
if (!pattern.apply(blockVector3).getBlockType().getMaterial().isAir())
{
blocksPlaced.putIfAbsent(playerAndSessionEntry, new AbstractMap.SimpleEntry<>(pattern, new ArrayList<>()));
blocksPlaced.get(playerAndSessionEntry).getValue().add(new Gson().fromJson(new Gson().toJson(blockVector3), blockVector3.getClass()));
BlockVector3 vectorClone = new Gson().fromJson(new Gson().toJson(blockVector3), blockVector3.getClass());
if (!blocksPlaced.get(playerAndSessionEntry).getValue().contains(vectorClone))
{
blocksPlaced.get(playerAndSessionEntry).getValue().add(vectorClone);
}
}
}
@ -138,23 +146,23 @@ public class FAWEBridge extends FreedomService
{
world = server.getWorld(editSession.getWorld().getName());
}
List<Block> blocks = new ArrayList<>();
List<BlockState> blocks = new ArrayList<>();
for (BlockVector3 blockVector3 : region)
{
blocks.add(world.getBlockAt(blockVector3.getBlockX(), blockVector3.getBlockY(), blockVector3.getBlockZ()));
blocks.add(world.getBlockAt(blockVector3.getBlockX(), blockVector3.getBlockY(), blockVector3.getBlockZ()).getState());
}
logBlockEdit(playerName, editSession, pattern, blocks);
}
public void logBlockEdit(String playerName, EditSession editSession, Pattern pattern, List<Block> blocks)
public void logBlockEdit(String playerName, EditSession editSession, Pattern pattern, List<BlockState> blocks)
{
Map.Entry<String, EditSession> playerAndSessionEntry = new AbstractMap.SimpleEntry(playerName, editSession);
server.getScheduler().scheduleSyncDelayedTask(plugin, () ->
server.getScheduler().scheduleAsyncDelayedTask(plugin, () ->
{
for (Block block : blocks)
for (BlockState block : blocks)
{
BlockVector3 blockVector3 = BlockVector3.at(block.getX(), block.getY(), block.getZ());

92
src/main/java/me/totalfreedom/totalfreedommod/command/Command_potion.java
View File

@ -17,7 +17,7 @@ import org.bukkit.potion.PotionEffectType;
@CommandPermissions(level = Rank.OP, source = SourceType.BOTH)
@CommandParameters(
description = "Manipulate your potion effects. Duration is measured in server ticks (~20 ticks per second).",
usage = "/<command> <list | clear [target name] | add <type> <duration> <amplifier> [target name]>",
usage = "/<command> <list | clearall | clear [target name] | add <type> <duration> <amplifier> [target name]>",
aliases="effect")
public class Command_potion extends FreedomCommand
{
@ -25,8 +25,9 @@ public class Command_potion extends FreedomCommand
@Override
public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{
if (args.length == 1 || args.length == 2)
switch (args.length)
{
case 1:
if (args[0].equalsIgnoreCase("list"))
{
List<String> potionEffectTypeNames = new ArrayList<>();
@ -46,6 +47,7 @@ public class Command_potion extends FreedomCommand
noPerms();
return true;
}
FUtil.staffAction(sender.getName(), "Cleared all potion effects from all players", true);
for (Player target : server.getOnlinePlayers())
{
@ -55,30 +57,32 @@ public class Command_potion extends FreedomCommand
}
}
}
else if (args[0].equalsIgnoreCase("clear"))
case 2:
if (args[0].equalsIgnoreCase("clear"))
{
Player target = playerSender;
if (args.length == 2)
if(args.length == 2)
{
target = getPlayer(args[1], true);
if (target == null)
if (!plugin.sl.isStaff(sender) && !target.equals(getPlayer(sender.getName())))
{
msg(FreedomCommand.PLAYER_NOT_FOUND, ChatColor.RED);
msg(ChatColor.RED + "Only staff can clear potion effects from other players.");
return true;
}
target = getPlayer(args[1], true);
}
else
{
if (senderIsConsole)
{
msg("You must specify a target player when using this command from the console.");
return true;
}
}
if (!plugin.sl.isStaff(sender))
if (target == null)
{
msg(ChatColor.RED + "Only staff can clear potion effects from other players.");
msg(FreedomCommand.PLAYER_NOT_FOUND, ChatColor.RED);
return true;
}
@ -89,19 +93,22 @@ public class Command_potion extends FreedomCommand
msg("Cleared all active potion effects " + (!target.equals(playerSender) ? "from player " + target.getName() + "." : "from yourself."), ChatColor.AQUA);
}
else
{
return false;
}
}
else if (args.length == 4 || args.length == 5)
{
break;
case 4:
case 5:
if (args[0].equalsIgnoreCase("add"))
{
Player target = playerSender;
if (args.length == 5)
{
if (!plugin.sl.isStaff(sender) && !getPlayer(args[4]).equals(getPlayer(sender.getName())))
{
sender.sendMessage(ChatColor.RED + "Only staff can apply potion effects to other players.");
return true;
}
target = getPlayer(args[4]);
if (target == null || plugin.sl.isVanished(target.getName()) && !plugin.sl.isStaff(sender))
@ -110,17 +117,13 @@ public class Command_potion extends FreedomCommand
return true;
}
}
else
{
if (senderIsConsole)
{
sender.sendMessage("You must specify a target player when using this command from the console.");
return true;
}
if (!plugin.sl.isStaff(sender))
{
sender.sendMessage(ChatColor.RED + "Only staff can apply potion effects to other players.");
return true;
}
PotionEffectType potion_effect_type = PotionEffectType.getByName(args[1]);
@ -161,16 +164,9 @@ public class Command_potion extends FreedomCommand
+ ", Duration: " + new_effect.getDuration()
+ ", Amplifier: " + new_effect.getAmplifier()
+ (!target.equals(playerSender) ? " to player " + target.getName() + "." : " to yourself."), ChatColor.AQUA);
return true;
}
else
{
return false;
}
}
else
{
break;
default:
return false;
}
return true;
@ -179,8 +175,9 @@ public class Command_potion extends FreedomCommand
@Override
public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
{
if (args.length == 1)
switch (args.length)
{
case 1:
List<String> arguments = new ArrayList<>();
arguments.addAll(Arrays.asList("list", "clear", "add"));
if (plugin.sl.isStaff(sender))
@ -188,9 +185,8 @@ public class Command_potion extends FreedomCommand
arguments.add("clearall");
}
return arguments;
}
else if (args.length == 2)
{
case 2:
if (args[0].equals("clear"))
{
if (plugin.sl.isStaff(sender))
@ -202,28 +198,32 @@ public class Command_potion extends FreedomCommand
{
return getAllPotionTypes();
}
}
else if (args.length == 3)
{
break;
case 3:
if (args[0].equals("add"))
{
return Arrays.asList("<duration>");
}
}
else if (args.length == 4)
{
break;
case 4:
if (args[0].equals("add"))
{
return Arrays.asList("<amplifier>");
}
}
else if (args.length == 5 && plugin.sl.isStaff(sender))
break;
case 5:
if (plugin.sl.isStaff(sender))
{
if (args[0].equals("add"))
{
return FUtil.getPlayerList();
}
}
break;
}
return Collections.emptyList();
}

2
src/main/resources/plugin.yml
View File

@ -2,6 +2,6 @@ name: TotalFreedomMod
main: me.totalfreedom.totalfreedommod.TotalFreedomMod
version: ${project.version}
description: Plugin for the Total Freedom server.
loadbefore: [BukkitTelnet, Essentials, LibsDisguises, WorldEdit, WorldGuard, WorldGuardExtraFlags, TFGuilds, SuperVanish, PremiumVanish]
loadbefore: [BukkitTelnet, Essentials, CoreProtect, LibsDisguises, WorldEdit, WorldGuard, WorldGuardExtraFlags, TFGuilds, SuperVanish, PremiumVanish]
authors: [Madgeek1450, Prozza]
api-version: 1.16