Anuken/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2024-09-11 08:15:35 +03:00
Code Issues Projects Releases Wiki Activity

Minor bullet despawn fix

Browse Source
This commit is contained in:
Anuken 2022-04-23 09:26:52 -04:00
parent d559cd2412
commit 9a05b36478
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java
View File

@ -596,10 +596,14 @@ public class EntityProcess extends BaseProcessor{
//write the groups
groupsBuilder.addMethod(groupInit.build());
groupsBuilder.addField(boolean.class, "isClearing", Modifier.PUBLIC, Modifier.STATIC);
MethodSpec.Builder groupClear = MethodSpec.methodBuilder("clear").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
groupClear.addStatement("isClearing = true");
for(GroupDefinition group : groupDefs){
groupClear.addStatement("$L.clear()", group.name);
}
groupClear.addStatement("isClearing = false");
//write clear
groupsBuilder.addMethod(groupClear.build());

5
core/src/mindustry/core/Renderer.java
View File

@ -82,6 +82,11 @@ public class Renderer implements ApplicationListener{
public Renderer(){
camera = new Camera();
Shaders.init();
Events.on(ResetEvent.class, e -> {
shakeTime = shakeIntensity = 0f;
camShakeOffset.setZero();
});
}
public void shake(float intensity, float duration){

2
core/src/mindustry/entities/comp/BulletComp.java
View File

@ -67,6 +67,8 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
@Override
public void remove(){
if(Groups.isClearing) return;
//'despawned' only counts when the bullet is killed externally or reaches the end of life
if(!hit){
type.despawned(self());