Loads of fixes

This commit is contained in:
Daniel Mills
2020-08-05 02:56:18 -04:00
parent a7428838b3
commit cd07f29038
25 changed files with 987 additions and 24 deletions

View File

@@ -52,7 +52,7 @@ public class CommandIrisObjectPaste extends MortarCommand
sender.sendMessage("Can't find " + "objects/" + args[0] + ".iob");
}
ItemStack wand = ((Player) sender).getInventory().getItemInMainHand();
ItemStack wand = sender.player().getInventory().getItemInMainHand();
IrisObject o = new IrisObject(0, 0, 0);
try
@@ -60,8 +60,8 @@ public class CommandIrisObjectPaste extends MortarCommand
o.read(new File(Iris.instance.getDataFolder(), "objects/" + args[0] + ".iob"));
sender.sendMessage("Loaded " + "objects/" + args[0] + ".iob");
((Player) sender).getWorld().playSound(((Player) sender).getLocation(), Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1f, 1.5f);
Location block = ((Player) sender).getTargetBlock((Set<Material>) null, 256).getLocation().clone().add(0, 1, 0);
sender.player().getWorld().playSound(sender.player().getLocation(), Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1f, 1.5f);
Location block = sender.player().getTargetBlock((Set<Material>) null, 256).getLocation().clone().add(0, 1, 0);
if(intoWand && WandController.isWand(wand))
{

View File

@@ -0,0 +1,60 @@
package com.volmit.iris.command;
import org.bukkit.World;
import org.bukkit.entity.Player;
import com.volmit.iris.Iris;
import com.volmit.iris.util.MortarCommand;
import com.volmit.iris.util.MortarSender;
import com.volmit.iris.util.PregenJob;
public class CommandIrisPregen extends MortarCommand
{
public CommandIrisPregen()
{
super("pregen");
setDescription("Pregen this world");
requiresPermission(Iris.perm.studio);
setCategory("Pregen");
}
@Override
public boolean handle(MortarSender sender, String[] args)
{
if(args[0].equalsIgnoreCase("stop"))
{
if(PregenJob.task == -1)
{
sender.sendMessage("No Active Pregens");
}
else
{
sender.sendMessage("Stopped all pregens.");
}
PregenJob.stop();
return true;
}
if(sender.isPlayer())
{
Player p = sender.player();
World world = p.getWorld();
new PregenJob(world, Integer.valueOf(args[0]));
return true;
}
else
{
sender.sendMessage("Players only.");
}
return true;
}
@Override
protected String getArgsUsage()
{
return "[width]";
}
}

View File

@@ -13,6 +13,9 @@ public class CommandIrisWorld extends MortarCommand
@Command
private CommandIrisMetrics metrics;
@Command
private CommandIrisPregen pregen;
public CommandIrisWorld()
{
super("world", "wrld");