diff --git a/src/main/java/com/minelittlepony/unicopia/player/DefaultPlayerSpecies.java b/src/main/java/com/minelittlepony/unicopia/player/DefaultPlayerSpecies.java deleted file mode 100644 index fa966a32..00000000 --- a/src/main/java/com/minelittlepony/unicopia/player/DefaultPlayerSpecies.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.minelittlepony.unicopia.player; - -import com.minelittlepony.unicopia.Race; -import com.minelittlepony.unicopia.power.IPower; -import com.minelittlepony.unicopia.spell.IMagicEffect; - -import net.minecraft.entity.player.EntityPlayer; - -final class DefaultPlayerSpecies implements IPlayer, IAbilityReceiver { - - public static final IPlayer INSTANCE = new DefaultPlayerSpecies(); - - private DefaultPlayerSpecies() { - } - - @Override - public Race getPlayerSpecies() { - return Race.EARTH; - } - - @Override - public void setPlayerSpecies(Race race) { - } - - @Override - public void sendCapabilities(boolean full) { - - } - - @Override - public void tryUseAbility(IPower power) { - - } - - @Override - public void tryClearAbility() { - - } - - @Override - public int getRemainingCooldown() { - return 0; - } - - @Override - public IAbilityReceiver getAbilities() { - return this; - } - - @Override - public boolean isClientPlayer() { - return false; - } - - @Override - public void onUpdate(EntityPlayer entity) { - - } - - @Override - public void setEffect(IMagicEffect effect) { - - } - - @Override - public IMagicEffect getEffect() { - return null; - } - - @Override - public EntityPlayer getOwner() { - return null; - } - - @Override - public void copyFrom(IPlayer oldPlayer) { - - } -} diff --git a/src/main/java/com/minelittlepony/unicopia/player/IPlayer.java b/src/main/java/com/minelittlepony/unicopia/player/IPlayer.java index 4d868eca..5c672c33 100644 --- a/src/main/java/com/minelittlepony/unicopia/player/IPlayer.java +++ b/src/main/java/com/minelittlepony/unicopia/player/IPlayer.java @@ -23,13 +23,9 @@ public interface IPlayer extends ICaster, InbtSerialisable, IUpdat void copyFrom(IPlayer oldPlayer); - default void onEntityEat() { + void onEntityEat(); - } - - default void onFall(float distance, float damageMultiplier) { - - } + void onFall(float distance, float damageMultiplier); static EntityPlayer getPlayerEntity(UUID playerId) { EntityPlayer player = FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList().getPlayerByUUID(playerId); diff --git a/src/main/java/com/minelittlepony/unicopia/player/PlayerSpeciesList.java b/src/main/java/com/minelittlepony/unicopia/player/PlayerSpeciesList.java index 321226fc..d3ee2ef9 100644 --- a/src/main/java/com/minelittlepony/unicopia/player/PlayerSpeciesList.java +++ b/src/main/java/com/minelittlepony/unicopia/player/PlayerSpeciesList.java @@ -28,10 +28,6 @@ public class PlayerSpeciesList { } public IPlayer getPlayer(EntityPlayer player) { - if (player == null) { - return DefaultPlayerSpecies.INSTANCE; - } - return FBS.of(player).getPlayer(); }