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

Fixed NPE when accessing the attached properties for an entity

Browse source
This commit is contained in:
Sollace 2020-04-24 19:36:30 +02:00
parent 03944f6015
commit 78dd6ea26f
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/com/minelittlepony/unicopia/mixin/MixinLivingEntity.java
View file

@ -16,7 +16,7 @@ import net.minecraft.entity.LivingEntity;
@Mixin(LivingEntity.class) @Mixin(LivingEntity.class)
abstract class MixinLivingEntity extends Entity implements PonyContainer<Ponylike> { abstract class MixinLivingEntity extends Entity implements PonyContainer<Ponylike> {
private final Ponylike caster = create(); private Ponylike caster;
private MixinLivingEntity() { super(null, null); } private MixinLivingEntity() { super(null, null); }
@ -27,12 +27,15 @@ abstract class MixinLivingEntity extends Entity implements PonyContainer<Ponylik
@Override @Override
public Ponylike get() { public Ponylike get() {
if (caster == null) {
caster = create();
}
return caster; return caster;
} }
@Inject(method = "canSee(Lnet/minecraft/entity/Entity;)Z", at = @At("HEAD")) @Inject(method = "canSee(Lnet/minecraft/entity/Entity;)Z", at = @At("HEAD"))
private void onCanSee(Entity other, CallbackInfoReturnable<Boolean> info) { private void onCanSee(Entity other, CallbackInfoReturnable<Boolean> info) {
if (caster.isInvisible()) { if (get().isInvisible()) {
info.setReturnValue(false); info.setReturnValue(false);
} }
} }
@ -42,25 +45,25 @@ abstract class MixinLivingEntity extends Entity implements PonyContainer<Ponylik
LivingEntity self = (LivingEntity)(Object)this; LivingEntity self = (LivingEntity)(Object)this;
if (!self.getActiveItem().isEmpty() && self.isUsingItem()) { if (!self.getActiveItem().isEmpty() && self.isUsingItem()) {
caster.onUse(self.getActiveItem()); get().onUse(self.getActiveItem());
} }
} }
@Inject(method = "jump()V", at = @At("RETURN")) @Inject(method = "jump()V", at = @At("RETURN"))
private void onJump(CallbackInfo info) { private void onJump(CallbackInfo info) {
caster.onJump(); get().onJump();
} }
@Inject(method = "tick()V", at = @At("HEAD"), cancellable = true) @Inject(method = "tick()V", at = @At("HEAD"), cancellable = true)
private void beforeTick(CallbackInfo info) { private void beforeTick(CallbackInfo info) {
if (caster.beforeUpdate()) { if (get().beforeUpdate()) {
info.cancel(); info.cancel();
} }
} }
@Inject(method = "tick()V", at = @At("RETURN")) @Inject(method = "tick()V", at = @At("RETURN"))
private void afterTick(CallbackInfo info) { private void afterTick(CallbackInfo info) {
caster.onUpdate(); get().onUpdate();
} }
@Inject(method = "<clinit>()V", at = @At("RETURN"), remap = false) @Inject(method = "<clinit>()V", at = @At("RETURN"), remap = false)