PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-27 23:27:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed sun blindness being incorrectly applied on the client when changing dimensions. Closes #55

Browse source
This commit is contained in:
Sollace 2022-03-28 19:34:55 +02:00
parent b35c592569
commit 3255eacd18
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/minelittlepony/unicopia/entity/effect/SunBlindnessStatusEffect.java
View file

@ -51,7 +51,7 @@ public class SunBlindnessStatusEffect extends StatusEffect {
public static boolean hasSunExposure(LivingEntity entity) { public static boolean hasSunExposure(LivingEntity entity) {
if (entity.hasNetherPortalCooldown()) { // TODO: test this. Entities shouldn't get sun blindness when existing a portal if (entity.hasNetherPortalCooldown()) {
return false; return false;
} }

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

@ -356,15 +356,16 @@ public class Pony extends Living<PlayerEntity> implements Transmittable, Copieab
if (getSpecies() == Race.BAT) { if (getSpecies() == Race.BAT) {
if (SunBlindnessStatusEffect.hasSunExposure(entity)) { if (SunBlindnessStatusEffect.hasSunExposure(entity)) {
System.out.println("Sun exposure " + entity);
if (ticksInSun < 200) { if (ticksInSun < 200) {
ticksInSun++; ticksInSun++;
} }
if (ticksInSun == 1) { if (ticksInSun == 1) {
entity.addStatusEffect(new StatusEffectInstance(UEffects.SUN_BLINDNESS, SunBlindnessStatusEffect.MAX_DURATION * 10, 1, true, false)); if (!isClient()) {
UCriteria.LOOK_INTO_SUN.trigger(entity); entity.addStatusEffect(new StatusEffectInstance(UEffects.SUN_BLINDNESS, SunBlindnessStatusEffect.MAX_DURATION * 10, 1, true, false));
UCriteria.LOOK_INTO_SUN.trigger(entity);
if (isClient() && isClientPlayer()) { } else if (isClientPlayer()) {
InteractionManager.instance().playLoopingSound(entity, InteractionManager.SOUND_EARS_RINGING); InteractionManager.instance().playLoopingSound(entity, InteractionManager.SOUND_EARS_RINGING);
} }
} }