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

Fixed crash when summoning sombra with commands when on peaceful mode. Closes #187

Browse source
This commit is contained in:
Sollace 2023-09-13 14:07:39 +01:00
parent b7487e9901
commit 7187ad61ee
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/main/java/com/minelittlepony/unicopia/entity/mob/SombraEntity.java
View file

@ -226,28 +226,30 @@ public class SombraEntity extends HostileEntity implements ArenaCombatant, Parti
setPersistent(); setPersistent();
Optional<BlockPos> homePos = getHomePos(); Optional<BlockPos> homePos = getHomePos();
if (homePos.isEmpty() && !isRemoved()) { if (homePos.isEmpty()) {
setHomePos(getWorld().getTopPosition(Type.MOTION_BLOCKING_NO_LEAVES, getBlockPos())); setHomePos(getWorld().getTopPosition(Type.MOTION_BLOCKING_NO_LEAVES, getBlockPos()));
homePos = getHomePos(); homePos = getHomePos();
} }
if (getBlockPos().getSquaredDistance(homePos.get()) > MathHelper.square(getAreaRadius())) { if (!isRemoved()) {
teleportTo(Vec3d.ofCenter(homePos.get())); if (getBlockPos().getSquaredDistance(homePos.get()) > MathHelper.square(getAreaRadius())) {
getNavigation().stop(); teleportTo(Vec3d.ofCenter(homePos.get()));
} getNavigation().stop();
}
prevBiteTime = biteTime; prevBiteTime = biteTime;
if (biteTime > 0) { if (biteTime > 0) {
biteTime--; biteTime--;
} }
float targetSize = getScaleFactor(); float targetSize = getScaleFactor();
boolean sizeChanging = prevSize != currentSize; boolean sizeChanging = prevSize != currentSize;
prevSize = currentSize; prevSize = currentSize;
tickGrowth(targetSize, sizeChanging); tickGrowth(targetSize, sizeChanging);
if (!hasPositionTarget() && homePos.isPresent()) { if (!hasPositionTarget() && homePos.isPresent()) {
setPositionTarget(homePos.get(), (int)getAreaRadius()); setPositionTarget(homePos.get(), (int)getAreaRadius());
}
} }
super.tick(); super.tick();