GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Always remove entities from cache (#4577)

Browse source 
* Always remove entities from cache

* Despawn throwable entities in the void
This commit is contained in:
AJ Ferguson 2024-04-17 03:18:17 -04:00 committed by GitHub
parent 5151c25e1a
commit c8475d8100
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 40 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/src/main/java/org/geysermc/geyser/entity/type/Entity.java
View file

@ -200,11 +200,9 @@ public class Entity implements GeyserEntity {
/**
* Despawns the entity
*
* @return can be deleted
*/
public boolean despawnEntity() {
if (!valid) return true;
public void despawnEntity() {
if (!valid) return;
for (Entity passenger : passengers) { // Make sure all passengers on the despawned entity are updated
if (passenger == null) continue;
@ -218,7 +216,6 @@ public class Entity implements GeyserEntity {
session.sendUpstreamPacket(removeEntityPacket);
valid = false;
return true;
}
public void moveRelative(double relX, double relY, double relZ, float yaw, float pitch, boolean isOnGround) {

3
core/src/main/java/org/geysermc/geyser/entity/type/FireballEntity.java
View file

@ -72,6 +72,9 @@ public class FireballEntity extends ThrowableEntity {
@Override
public void tick() {
if (removedInVoid()) {
return;
}
moveAbsoluteImmediate(tickMovement(position), getYaw(), getPitch(), getHeadYaw(), false, false);
}
}

3
core/src/main/java/org/geysermc/geyser/entity/type/FishingHookEntity.java
View file

@ -133,6 +133,9 @@ public class FishingHookEntity extends ThrowableEntity {
@Override
public void tick() {
if (removedInVoid()) {
return;
}
if (hooked || !isInAir() && !isInWater() || isOnGround()) {
motion = Vector3f.ZERO;
return;

2
core/src/main/java/org/geysermc/geyser/entity/type/ItemEntity.java
View file

@ -74,7 +74,7 @@ public class ItemEntity extends ThrowableEntity {
@Override
public void tick() {
if (isInWater()) {
if (removedInVoid() || isInWater()) {
return;
}
if (!isOnGround() || (motion.getX() * motion.getX() + motion.getZ() * motion.getZ()) > 0.00001) {

3
core/src/main/java/org/geysermc/geyser/entity/type/ItemFrameEntity.java
View file

@ -148,7 +148,7 @@ public class ItemFrameEntity extends Entity {
}
@Override
public boolean despawnEntity() {
public void despawnEntity() {
UpdateBlockPacket updateBlockPacket = new UpdateBlockPacket();
updateBlockPacket.setDataLayer(0);
updateBlockPacket.setBlockPosition(bedrockPosition);
@ -161,7 +161,6 @@ public class ItemFrameEntity extends Entity {
session.getItemFrameCache().remove(bedrockPosition, this);
valid = false;
return true;
}
private NbtMap getDefaultTag() {

20
core/src/main/java/org/geysermc/geyser/entity/type/ThrowableEntity.java
View file

@ -55,6 +55,9 @@ public class ThrowableEntity extends Entity implements Tickable {
*/
@Override
public void tick() {
if (removedInVoid()) {
return;
}
moveAbsoluteImmediate(position.add(motion), getYaw(), getPitch(), getHeadYaw(), isOnGround(), false);
float drag = getDrag();
float gravity = getGravity();
@ -170,14 +173,14 @@ public class ThrowableEntity extends Entity implements Tickable {
}
@Override
public boolean despawnEntity() {
public void despawnEntity() {
if (definition.entityType() == EntityType.ENDER_PEARL) {
LevelEventPacket particlePacket = new LevelEventPacket();
particlePacket.setType(LevelEvent.PARTICLE_TELEPORT);
particlePacket.setPosition(position);
session.sendUpstreamPacket(particlePacket);
}
return super.despawnEntity();
super.despawnEntity();
}
@Override
@ -191,4 +194,17 @@ public class ThrowableEntity extends Entity implements Tickable {
moveAbsoluteImmediate(position, yaw, pitch, headYaw, isOnGround, teleported);
lastJavaPosition = position;
}
/**
* Removes the entity if it is 64 blocks below the world.
*
* @return true if the entity was removed
*/
public boolean removedInVoid() {
if (position.getY() < session.getDimensionType().minY() - 64) {
session.getEntityCache().removeEntity(this);
return true;
}
return false;
}
}

4
core/src/main/java/org/geysermc/geyser/entity/type/living/ArmorStandEntity.java
View file

@ -99,11 +99,11 @@ public class ArmorStandEntity extends LivingEntity {
}
@Override
public boolean despawnEntity() {
public void despawnEntity() {
if (secondEntity != null) {
secondEntity.despawnEntity();
}
return super.despawnEntity();
super.despawnEntity();
}
@Override

4
core/src/main/java/org/geysermc/geyser/entity/type/living/monster/EnderDragonEntity.java
View file

@ -148,11 +148,11 @@ public class EnderDragonEntity extends MobEntity implements Tickable {
}
@Override
public boolean despawnEntity() {
public void despawnEntity() {
for (EnderDragonPartEntity part : allParts) {
part.despawnEntity();
}
return super.despawnEntity();
super.despawnEntity();
}
@Override

12
core/src/main/java/org/geysermc/geyser/session/cache/EntityCache.java vendored
View file

@ -85,27 +85,29 @@ public class EntityCache {
return false;
}
public boolean removeEntity(Entity entity, boolean force) {
public void removeEntity(Entity entity) {
if (entity instanceof PlayerEntity player) {
session.getPlayerWithCustomHeads().remove(player.getUuid());
}
if (entity != null && entity.isValid() && (force || entity.despawnEntity())) {
if (entity != null) {
if (entity.isValid()) {
entity.despawnEntity();
}
long geyserId = entityIdTranslations.remove(entity.getEntityId());
entities.remove(geyserId);
if (entity instanceof Tickable) {
tickableEntities.remove(entity);
}
return true;
}
return false;
}
public void removeAllEntities() {
List<Entity> entities = new ArrayList<>(this.entities.values());
for (Entity entity : entities) {
removeEntity(entity, false);
removeEntity(entity);
}
session.getPlayerWithCustomHeads().clear();

2
core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaRemoveEntitiesTranslator.java
View file

@ -39,7 +39,7 @@ public class JavaRemoveEntitiesTranslator extends PacketTranslator<ClientboundRe
for (int entityId : packet.getEntityIds()) {
Entity entity = session.getEntityCache().getEntityByJavaId(entityId);
if (entity != null) {
session.getEntityCache().removeEntity(entity, false);
session.getEntityCache().removeEntity(entity);
}
}
}