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

Prevent transforming into paintings, item frames, or leash knots. Fixes #39

Browse source
This commit is contained in:
Sollace 2021-12-28 02:58:07 +02:00
parent 8edf3cee6c
commit c31eba5f04
4 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/com/minelittlepony/unicopia/ability/ChangelingDisguiseAbility.java
View file

@ -14,6 +14,7 @@ import com.minelittlepony.unicopia.util.RayTraceHelper;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.FallingBlockEntity; import net.minecraft.entity.FallingBlockEntity;
import net.minecraft.entity.LightningEntity; import net.minecraft.entity.LightningEntity;
import net.minecraft.entity.decoration.AbstractDecorationEntity;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.predicate.entity.EntityPredicates; import net.minecraft.predicate.entity.EntityPredicates;
import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundCategory;
@ -43,7 +44,7 @@ public class ChangelingDisguiseAbility extends ChangelingFeedAbility {
RayTraceHelper.Trace trace = RayTraceHelper.doTrace(player, 10, 1, EntityPredicates.EXCEPT_SPECTATOR.and(e -> !(e instanceof LightningEntity))); RayTraceHelper.Trace trace = RayTraceHelper.doTrace(player, 10, 1, EntityPredicates.EXCEPT_SPECTATOR.and(e -> !(e instanceof LightningEntity)));
Entity looked = trace.getEntity().map(e -> { Entity looked = trace.getEntity().filter(e -> !(e instanceof AbstractDecorationEntity)).map(e -> {
return e instanceof PlayerEntity ? Pony.of((PlayerEntity)e) return e instanceof PlayerEntity ? Pony.of((PlayerEntity)e)
.getSpellSlot() .getSpellSlot()
.get(SpellPredicate.IS_DISGUISE, true) .get(SpellPredicate.IS_DISGUISE, true)

3
src/main/java/com/minelittlepony/unicopia/command/DisguiseCommand.java
View file

@ -20,6 +20,7 @@ import net.minecraft.command.argument.NbtCompoundArgumentType;
import net.minecraft.command.suggestion.SuggestionProviders; import net.minecraft.command.suggestion.SuggestionProviders;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityType; import net.minecraft.entity.EntityType;
import net.minecraft.entity.decoration.AbstractDecorationEntity;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.nbt.NbtCompound; import net.minecraft.nbt.NbtCompound;
import net.minecraft.server.command.CommandManager; import net.minecraft.server.command.CommandManager;
@ -77,7 +78,7 @@ public class DisguiseCommand {
} }
static int disguise(ServerCommandSource source, PlayerEntity player, Entity entity) throws CommandSyntaxException { static int disguise(ServerCommandSource source, PlayerEntity player, Entity entity) throws CommandSyntaxException {
if (entity == null) { if (entity == null || entity instanceof AbstractDecorationEntity) {
throw FAILED_EXCEPTION.create(); throw FAILED_EXCEPTION.create();
} }

3
src/main/java/com/minelittlepony/unicopia/entity/behaviour/EntityAppearance.java
View file

@ -269,7 +269,8 @@ public class EntityAppearance implements NbtSerialisable, PlayerDimensions.Provi
public boolean skipsUpdate() { public boolean skipsUpdate() {
return entity instanceof FallingBlockEntity return entity instanceof FallingBlockEntity
|| entity instanceof AbstractDecorationEntity || entity instanceof AbstractDecorationEntity
|| entity instanceof PlayerEntity; || entity instanceof PlayerEntity
|| entity instanceof AbstractDecorationEntity;
} }
public boolean isAxisAligned() { public boolean isAxisAligned() {

6
src/main/java/com/minelittlepony/unicopia/entity/behaviour/EntityBehaviour.java
View file

@ -20,6 +20,7 @@ import net.minecraft.entity.FallingBlockEntity;
import net.minecraft.entity.LivingEntity; import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.MovementType; import net.minecraft.entity.MovementType;
import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.damage.DamageSource;
import net.minecraft.entity.decoration.AbstractDecorationEntity;
import net.minecraft.entity.mob.AbstractSkeletonEntity; import net.minecraft.entity.mob.AbstractSkeletonEntity;
import net.minecraft.entity.passive.LlamaEntity; import net.minecraft.entity.passive.LlamaEntity;
import net.minecraft.entity.passive.SnowGolemEntity; import net.minecraft.entity.passive.SnowGolemEntity;
@ -112,7 +113,12 @@ public class EntityBehaviour<T extends Entity> {
boolean clip = to.noClip; boolean clip = to.noClip;
to.noClip = false; to.noClip = false;
Vec3d vel = from.getRotationVec(1); Vec3d vel = from.getRotationVec(1);
if (!(to instanceof AbstractDecorationEntity)) {
to.move(MovementType.SELF, vel); to.move(MovementType.SELF, vel);
} else {
to.setVelocity(Vec3d.ZERO);
}
to.noClip = clip; to.noClip = clip;
} else { } else {
to.verticalCollision = from.verticalCollision; to.verticalCollision = from.verticalCollision;