From 3d3409730e542789eee2fa0764b45349c8f48d53 Mon Sep 17 00:00:00 2001 From: Sollace Date: Thu, 13 Sep 2018 12:45:24 +0200 Subject: [PATCH] Enforce the species blacklist --- .../minelittlepony/unicopia/player/PlayerCapabilities.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/minelittlepony/unicopia/player/PlayerCapabilities.java b/src/main/java/com/minelittlepony/unicopia/player/PlayerCapabilities.java index 14f40bf2..abd7b1fa 100644 --- a/src/main/java/com/minelittlepony/unicopia/player/PlayerCapabilities.java +++ b/src/main/java/com/minelittlepony/unicopia/player/PlayerCapabilities.java @@ -50,6 +50,7 @@ class PlayerCapabilities implements IPlayer, ICaster { if (getOwner() == null) { return Race.HUMAN; } + return Race.fromId(getOwner().getDataManager().get(PLAYER_RACE)); } @@ -57,6 +58,10 @@ class PlayerCapabilities implements IPlayer, ICaster { public void setPlayerSpecies(Race race) { EntityPlayer self = getOwner(); + if (!PlayerSpeciesList.instance().speciesPermitted(race)) { + race = Race.HUMAN; + } + if (self != null) { getOwner().getDataManager().set(PLAYER_RACE, race.ordinal());