sen/tcr
sen/tcr
1
0
Fork 0
Code Issues Pull requests Activity

impove camera entity handling

Browse source
This commit is contained in:
Sen 2025-08-07 15:28:07 +02:00
parent 8a72694a74
commit 3960bff398
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
4 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
client/src/main/resources/textures/npc/hacker.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.5 KiB

BIN
client/src/main/resources/textures/npc/trollface.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2 KiB

10
common/src/main/java/common/entity/npc/EntityCameraHolder.java
View file

@ -5,8 +5,8 @@ import common.rng.Random;
import common.world.World; import common.world.World;
public class EntityCameraHolder extends EntityNPC { public class EntityCameraHolder extends EntityNPC {
public EntityCameraHolder(World worldIn) { public EntityCameraHolder(World world) {
super(worldIn); super(world);
} }
public int getBaseHealth(Random rand) { public int getBaseHealth(Random rand) {
@ -45,4 +45,10 @@ public class EntityCameraHolder extends EntityNPC {
public boolean canNaturallyFly() { public boolean canNaturallyFly() {
return true; return true;
} }
public void onUpdate() {
super.onUpdate();
if(!this.isPlayer())
this.setDead();
}
} }

3
server/src/main/java/server/init/UniverseRegistry.java
View file

@ -31,6 +31,7 @@ import common.entity.animal.EntitySheep;
import common.entity.animal.EntityWolf; import common.entity.animal.EntityWolf;
import common.entity.npc.EntityArachnoid; import common.entity.npc.EntityArachnoid;
import common.entity.npc.EntityBloodElf; import common.entity.npc.EntityBloodElf;
import common.entity.npc.EntityCameraHolder;
import common.entity.npc.EntityCultivator; import common.entity.npc.EntityCultivator;
import common.entity.npc.EntityElf; import common.entity.npc.EntityElf;
import common.entity.npc.EntityFireDemon; import common.entity.npc.EntityFireDemon;
@ -737,7 +738,7 @@ public abstract class UniverseRegistry extends DimensionRegistry {
.addLiquid(Blocks.flowing_water.getState(), 1, 8, 255, false) .addLiquid(Blocks.flowing_water.getState(), 1, 8, 255, false)
.addLiquid(Blocks.flowing_lava.getState(), 40, 8, 255, true); .addLiquid(Blocks.flowing_lava.getState(), 40, 8, 255, true);
for(Class<? extends Entity> clazz : EntityRegistry.getAllClasses()) { for(Class<? extends Entity> clazz : EntityRegistry.getAllClasses()) {
if(EntityLiving.class.isAssignableFrom(clazz)) if(EntityLiving.class.isAssignableFrom(clazz) && clazz != EntityCameraHolder.class)
warp.addSpawn((Class<? extends EntityLiving>)clazz, 1, 1, 8); warp.addSpawn((Class<? extends EntityLiving>)clazz, 1, 1, 8);
} }
registerSemi("warp", "Der Warp", new Semi(0x0c001f, 0x190033, 124072917, 285.0f, 3, Blocks.obsidian.getState(), Blocks.lava.getState(), 63) registerSemi("warp", "Der Warp", new Semi(0x0c001f, 0x190033, 124072917, 285.0f, 3, Blocks.obsidian.getState(), Blocks.lava.getState(), 63)