Skip to content

Commit

Permalink
Enforce check on entity ticking in setPositionFromSystem()
Browse files Browse the repository at this point in the history
  • Loading branch information
@minecrafter
minecrafter committed Nov 19, 2016
1 parent 3f7b821 commit 1863a4c
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 55 deletions.
1 change: 1 addition & 0 deletions server/src/main/java/com/voxelwind/server/game/entities/BaseEntity.java
View file
Expand Up @@ -87,6 +87,7 @@ protected void setPosition(Vector3f position) {

@Override
public void setPositionFromSystem(Vector3f position) {
Preconditions.checkState(level.getEntityManager().isTicking(), "entities in level are not being ticked");
setPosition(position);
}

Expand Down
121 changes: 66 additions & 55 deletions server/src/main/java/com/voxelwind/server/game/level/manager/LevelEntityManager.java
View file
Expand Up @@ -35,6 +35,7 @@ public class LevelEntityManager {
private final List<System> systems = new CopyOnWriteArrayList<>();
private final AtomicLong entityIdAllocator = new AtomicLong();
private final AtomicBoolean entitiesChanged = new AtomicBoolean(false);
private final AtomicBoolean entitiesTicking = new AtomicBoolean(false);
private final VoxelwindLevel level;

public LevelEntityManager(VoxelwindLevel level) {
Expand All @@ -55,79 +56,85 @@ public void deregisterSystem(System system) {
}

public void onTick() {
entitiesTicking.set(true);

TLongObjectMap<BaseEntity> copy;
synchronized (entities) {
copy = new TLongObjectHashMap<>(entities);
}

for (TLongObjectIterator<BaseEntity> it = copy.iterator(); it.hasNext(); ) {
it.advance();
BaseEntity entity = it.value();
boolean isPlayer = entity instanceof PlayerSession;
try {
// Check if the entity was removed.
if (entity.isRemoved()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("{} was removed, discarding.", entity);
try {
for (TLongObjectIterator<BaseEntity> it = copy.iterator(); it.hasNext(); ) {
it.advance();
BaseEntity entity = it.value();
boolean isPlayer = entity instanceof PlayerSession;
try {
// Check if the entity was removed.
if (entity.isRemoved()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("{} was removed, discarding.", entity);
}
entitiesChanged.set(true);
synchronized (entities) {
entities.remove(entity.getEntityId());
}
continue;
}
entitiesChanged.set(true);
synchronized (entities) {
entities.remove(entity.getEntityId());

// Tick all entity systems.
for (System system : systems) {
if (!system.isSystemCompatible(entity)) {
continue;
}
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Running entity system {} on {}", system, entity);
}
system.getRunner().run(entity);
}
continue;
}

// Tick all entity systems.
for (System system : systems) {
if (!system.isSystemCompatible(entity)) {
// After ticking the systems, one of them may have removed the entity. Check it again.
if (entity.isRemoved()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("{} was removed after systems ticked, discarding.", entity);
}
entitiesChanged.set(true);
synchronized (entities) {
entities.remove(entity.getEntityId());
}
continue;
}
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Running entity system {} on {}", system, entity);
}
system.getRunner().run(entity);
}

// After ticking the systems, one of them may have removed the entity. Check it again.
if (entity.isRemoved()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("{} was removed after systems ticked, discarding.", entity);
if (entity.isStale()) {
// Need to send packets.
McpeMoveEntity moveEntityPacket = new McpeMoveEntity();
moveEntityPacket.setEntityId(entity.getEntityId());
moveEntityPacket.setPosition(entity.getGamePosition());
moveEntityPacket.setRotation(entity.getRotation());
level.getPacketManager().queuePacketForViewers(entity, moveEntityPacket);

McpeSetEntityMotion motionPacket = new McpeSetEntityMotion();
motionPacket.setEntityId(entity.getEntityId());
motionPacket.setMotion(entity.getMotion());
level.getPacketManager().queuePacketForViewers(entity, motionPacket);

entity.resetStale();
}
} catch (Exception e) {
entitiesChanged.set(true);
synchronized (entities) {
entities.remove(entity.getEntityId());
}
continue;
}

if (entity.isStale()) {
// Need to send packets.
McpeMoveEntity moveEntityPacket = new McpeMoveEntity();
moveEntityPacket.setEntityId(entity.getEntityId());
moveEntityPacket.setPosition(entity.getGamePosition());
moveEntityPacket.setRotation(entity.getRotation());
level.getPacketManager().queuePacketForViewers(entity, moveEntityPacket);

McpeSetEntityMotion motionPacket = new McpeSetEntityMotion();
motionPacket.setEntityId(entity.getEntityId());
motionPacket.setMotion(entity.getMotion());
level.getPacketManager().queuePacketForViewers(entity, motionPacket);

entity.resetStale();
}
} catch (Exception e) {
entitiesChanged.set(true);
synchronized (entities) {
entities.remove(entity.getEntityId());
}
if (!isPlayer) {
LOGGER.error("Unable to tick entity {}. The entity will be removed.", entity, e);
entity.remove();
} else {
LOGGER.error("Unable to tick player {}. The player will be disconnected.", entity, e);
((PlayerSession) entity).disconnect("Internal server error during tick");
if (!isPlayer) {
LOGGER.error("Unable to tick entity {}. The entity will be removed.", entity, e);
entity.remove();
} else {
LOGGER.error("Unable to tick player {}. The player will be disconnected.", entity, e);
((PlayerSession) entity).disconnect("Internal server error during tick");
}
}
}
} finally {
entitiesTicking.set(false);
}

// Perform a view check for all players if needed.
Expand Down Expand Up @@ -217,4 +224,8 @@ public Collection<BaseEntity> getEntitiesInBounds(BoundingBox boundingBox) {
return inDistance;
}
}

public boolean isTicking() {
return entitiesTicking.get();
}
}

0 comments on commit 1863a4c

Please sign in to comment.