TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-14 21:22:09 +00:00
Code Issues Projects Releases Wiki Activity

Tidy up Commandremove a bit, thanks to Evonuts

Browse source
This commit is contained in:
Iaccidentally 2013-11-10 17:57:16 -05:00 committed by KHobbits
parent f400f81e4d
commit 82be7546d5
1 changed files with 38 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
Essentials/src/com/earth2me/essentials/commands/Commandremove.java
View file

@ -110,115 +110,114 @@ public class Commandremove extends EssentialsCommand
continue; continue;
} }
} }
//TODO: this would probably be better as a case statement instead of all the ifs if (e instanceof Tameable)
if (toRemove == ToRemove.DROPS)
{ {
if (((Tameable)e).isTamed())
{
continue;
}
}
switch (toRemove)
{
case DROPS:
if (e instanceof Item) if (e instanceof Item)
{ {
e.remove(); e.remove();
removed++; removed++;
} }
} ;
else if (toRemove == ToRemove.ARROWS) break;
{ case ARROWS:
if (e instanceof Projectile) if (e instanceof Projectile)
{ {
e.remove(); e.remove();
removed++; removed++;
} }
} break;
else if (toRemove == ToRemove.BOATS) case BOATS:
{
if (e instanceof Boat) if (e instanceof Boat)
{ {
e.remove(); e.remove();
removed++; removed++;
} }
} break;
else if (toRemove == ToRemove.MINECARTS) case MINECARTS:
{
if (e instanceof Minecart) if (e instanceof Minecart)
{ {
e.remove(); e.remove();
removed++; removed++;
} }
} break;
else if (toRemove == ToRemove.XP) case XP:
{
if (e instanceof ExperienceOrb) if (e instanceof ExperienceOrb)
{ {
e.remove(); e.remove();
removed++; removed++;
} }
} break;
else if (toRemove == ToRemove.PAINTINGS) case PAINTINGS:
{
if (e instanceof Painting) if (e instanceof Painting)
{ {
e.remove(); e.remove();
removed++; removed++;
} }
} break;
else if (toRemove == ToRemove.ITEMFRAMES) case ITEMFRAMES:
{
if (e instanceof ItemFrame) if (e instanceof ItemFrame)
{ {
e.remove(); e.remove();
removed++; removed++;
} }
} break;
else if (toRemove == ToRemove.ENDERCRYSTALS) case ENDERCRYSTALS:
{
if (e instanceof EnderCrystal) if (e instanceof EnderCrystal)
{ {
e.remove(); e.remove();
removed++; removed++;
} }
} break;
else if (toRemove == ToRemove.AMBIENT) case AMBIENT:
{
if (e instanceof Flying) if (e instanceof Flying)
{ {
e.remove(); e.remove();
removed++; removed++;
} }
} break;
else if (toRemove == ToRemove.HOSTILE || toRemove == ToRemove.MONSTERS) case HOSTILE:
{ case MONSTERS:
if (e instanceof Monster || e instanceof ComplexLivingEntity || e instanceof Flying || e instanceof Slime) if (e instanceof Monster || e instanceof ComplexLivingEntity || e instanceof Flying || e instanceof Slime)
{ {
e.remove(); e.remove();
removed++; removed++;
} }
} break;
else if (toRemove == ToRemove.PASSIVE || toRemove == ToRemove.ANIMALS) case PASSIVE:
{ case ANIMALS:
if (e instanceof Animals || e instanceof NPC || e instanceof Snowman || e instanceof WaterMob) if (e instanceof Animals || e instanceof NPC || e instanceof Snowman || e instanceof WaterMob)
{ {
e.remove(); e.remove();
removed++; removed++;
} }
} break;
else if (toRemove == ToRemove.MOBS) case MOBS:
{
if (e instanceof Animals || e instanceof NPC || e instanceof Snowman || e instanceof WaterMob if (e instanceof Animals || e instanceof NPC || e instanceof Snowman || e instanceof WaterMob
|| e instanceof Monster || e instanceof ComplexLivingEntity || e instanceof Flying || e instanceof Slime) || e instanceof Monster || e instanceof ComplexLivingEntity || e instanceof Flying || e instanceof Slime)
{ {
e.remove(); e.remove();
removed++; removed++;
} }
} break;
else if (toRemove == ToRemove.ENTITIES) case ENTITIES:
{
if (e instanceof Entity) if (e instanceof Entity)
{ {
if (e instanceof HumanEntity) if (e instanceof HumanEntity)
{ {
continue; continue;
} }
e.remove(); e.remove();
removed++; removed++;
} }
break;
} }
} }
} }