PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-02-01 03:26:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix some errors

Browse source
This commit is contained in:
Sollace 2023-01-27 22:19:57 +00:00
parent 2b227eee1a
commit f17a682d8c
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/com/minelittlepony/unicopia/entity/effect/RaceChangeStatusEffect.java
View file

@ -70,10 +70,6 @@ public class RaceChangeStatusEffect extends StatusEffect {
return; return;
} }
if (eq instanceof Pony pony) {
pony.setRespawnRace(race);
}
int ticks = Math.max(0, MAX_DURATION - state.getDuration()); int ticks = Math.max(0, MAX_DURATION - state.getDuration());
Stage stage = Stage.forDuration(ticks / STAGE_DURATION); Stage stage = Stage.forDuration(ticks / STAGE_DURATION);
@ -99,6 +95,7 @@ public class RaceChangeStatusEffect extends StatusEffect {
if (eq instanceof Pony pony) { if (eq instanceof Pony pony) {
MagicReserves magic = pony.getMagicalReserves(); MagicReserves magic = pony.getMagicalReserves();
pony.setRespawnRace(race);
magic.getExertion().add(50); magic.getExertion().add(50);
magic.getEnergy().add(3); magic.getEnergy().add(3);
magic.getExhaustion().add(3); magic.getExhaustion().add(3);

2
src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java
View file

@ -630,7 +630,7 @@ public class Pony extends Living<PlayerEntity> implements Copyable<Pony>, Update
boolean forcedSwap = !alive boolean forcedSwap = !alive
&& entity instanceof ServerPlayerEntity && entity instanceof ServerPlayerEntity
&& entity.world.getGameRules().getBoolean(UGameRules.SWAP_TRIBE_ON_DEATH) && entity.world.getGameRules().getBoolean(UGameRules.SWAP_TRIBE_ON_DEATH)
&& oldPlayer.asEntity().getDamageTracker().getMostRecentDamage().getDamageSource() != MagicalDamageSource.TRIBE_SWAP; && oldPlayer.respawnRace == Race.UNSET;
if (alive) { if (alive) {
oldPlayer.getSpellSlot().stream(true).forEach(getSpellSlot()::put); oldPlayer.getSpellSlot().stream(true).forEach(getSpellSlot()::put);