Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some small performance optimizations.

Browse Source
This commit is contained in:
Olof Larsson 2015-11-06 12:58:08 +01:00
parent 52af87a4bd
commit 4cef1206e5
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/massivecraft/massivecore/command/type/TypeAbstract.java
View File

@ -15,7 +15,6 @@ import org.bukkit.command.CommandSender;
import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.Named; import com.massivecraft.massivecore.Named;
import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.collections.MassiveList;
import com.massivecraft.massivecore.collections.MassiveSet;
import com.massivecraft.massivecore.command.editor.CommandEditAbstract; import com.massivecraft.massivecore.command.editor.CommandEditAbstract;
import com.massivecraft.massivecore.command.editor.CommandEditSimple; import com.massivecraft.massivecore.command.editor.CommandEditSimple;
import com.massivecraft.massivecore.command.editor.EditSettings; import com.massivecraft.massivecore.command.editor.EditSettings;
@ -122,7 +121,7 @@ public abstract class TypeAbstract<T> implements Type<T>
public Set<String> getVisualsInner(T value, CommandSender sender) public Set<String> getVisualsInner(T value, CommandSender sender)
{ {
return new MassiveSet<String>(this.getVisualInner(value, sender)); return Collections.singleton(this.getVisualInner(value, sender));
} }
public Set<String> getVisualsInner(T value) public Set<String> getVisualsInner(T value)
{ {
@ -131,7 +130,7 @@ public abstract class TypeAbstract<T> implements Type<T>
public Set<String> getVisuals(T value, CommandSender sender) public Set<String> getVisuals(T value, CommandSender sender)
{ {
if (value == null) return new MassiveSet<String>(NULL); if (value == null) return Collections.singleton(NULL);
return this.getVisualsInner(value, sender); return this.getVisualsInner(value, sender);
} }
public Set<String> getVisuals(T value) public Set<String> getVisuals(T value)
@ -162,12 +161,12 @@ public abstract class TypeAbstract<T> implements Type<T>
public Set<String> getNamesInner(T value) public Set<String> getNamesInner(T value)
{ {
return new MassiveSet<String>(this.getNameInner(value)); return Collections.singleton(this.getNameInner(value));
} }
public Set<String> getNames(T value) public Set<String> getNames(T value)
{ {
if (value == null) return new MassiveSet<String>(); if (value == null) return Collections.emptySet();
return this.getNamesInner(value); return this.getNamesInner(value);
} }
@ -198,12 +197,12 @@ public abstract class TypeAbstract<T> implements Type<T>
public Set<String> getIdsInner(T value) public Set<String> getIdsInner(T value)
{ {
return new MassiveSet<String>(this.getIdInner(value)); return Collections.singleton(this.getIdInner(value));
} }
public Set<String> getIds(T value) public Set<String> getIds(T value)
{ {
if (value == null) return new MassiveSet<String>(); if (value == null) return Collections.emptySet();
return this.getIdsInner(value); return this.getIdsInner(value);
} }

4
src/com/massivecraft/massivecore/command/type/enumeration/TypeEntityType.java
View File

@ -4,6 +4,8 @@ import java.util.Set;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import com.massivecraft.massivecore.collections.MassiveSet;
public class TypeEntityType extends TypeEnum<EntityType> public class TypeEntityType extends TypeEnum<EntityType>
{ {
// -------------------------------------------- // // -------------------------------------------- //
@ -24,7 +26,7 @@ public class TypeEntityType extends TypeEnum<EntityType>
@Override @Override
public Set<String> getNamesInner(EntityType value) public Set<String> getNamesInner(EntityType value)
{ {
Set<String> ret = super.getNamesInner(value); Set<String> ret = new MassiveSet<String>(super.getNamesInner(value));
if (value == EntityType.PIG_ZOMBIE) if (value == EntityType.PIG_ZOMBIE)
{ {

4
src/com/massivecraft/massivecore/command/type/enumeration/TypeWorldType.java
View File

@ -4,6 +4,8 @@ import java.util.Set;
import org.bukkit.WorldType; import org.bukkit.WorldType;
import com.massivecraft.massivecore.collections.MassiveSet;
public class TypeWorldType extends TypeEnum<WorldType> public class TypeWorldType extends TypeEnum<WorldType>
{ {
// -------------------------------------------- // // -------------------------------------------- //
@ -24,7 +26,7 @@ public class TypeWorldType extends TypeEnum<WorldType>
@Override @Override
public Set<String> getNamesInner(WorldType value) public Set<String> getNamesInner(WorldType value)
{ {
Set<String> ret = super.getNamesInner(value); Set<String> ret = new MassiveSet<String>(super.getNamesInner(value));
if (value == WorldType.NORMAL) if (value == WorldType.NORMAL)
{ {