Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-16 00:44:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into more-events

Browse Source
This commit is contained in:
KingRainbow44
2022-08-01 21:13:19 -04:00
parent b9b4b6f428 f25fb62942
commit 1de402bd6f
81 changed files with 2153 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/emu/grasscutter/game/entity/EntityGadget.java
View File

@@ -223,6 +223,10 @@ public class EntityGadget extends EntityBaseGadget {
.setIsEnableInteract(true)
.setAuthorityPeerId(this.getScene().getWorld().getHostPeerId());
if(this.metaGadget != null) {
gadgetInfo.setDraftId(this.metaGadget.draft_id);
}
if (this.getContent() != null) {
this.getContent().onBuildProto(gadgetInfo);
}

12
src/main/java/emu/grasscutter/game/entity/EntityRegion.java
View File

@@ -15,6 +15,7 @@ import java.util.concurrent.ConcurrentHashMap;
public class EntityRegion extends GameEntity{
private final Position position;
private boolean hasNewEntities;
private boolean entityLeave;
private final Set<Integer> entities; // Ids of entities inside this region
private final SceneRegion metaRegion;
@@ -45,10 +46,17 @@ public class EntityRegion extends GameEntity{
hasNewEntities = false;
}
public void removeEntity(GameEntity entity) {
this.getEntities().remove(entity.getId());
public void removeEntity(int entityId) {
this.getEntities().remove(entityId);
this.entityLeave = true;
}
public void removeEntity(GameEntity entity) {
this.getEntities().remove(entity.getId());
this.entityLeave = true;
}
public boolean entityLeave() {return this.entityLeave;}
public void resetEntityLeave() {this.entityLeave = false;}
@Override
public Int2FloatOpenHashMap getFightProperties() {
return null;