LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.9.0: various crash fixes relating to on-ID talents

Browse Source
This commit is contained in:
Evan Debenham 2020-09-25 02:35:29 -04:00
parent 2580403865
commit 46165bd10c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
View File

@ -824,7 +824,7 @@ public class GameScene extends PixelScene {
}
public static void effect( Visual effect ) {
scene.effects.add( effect );
if (scene != null) scene.effects.add( effect );
}
public static void effectOverFog( Visual effect ) {

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java
View File

@ -302,19 +302,19 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
public Emitter emitter() {
Emitter emitter = GameScene.emitter();
emitter.pos( this );
if (emitter != null) emitter.pos( this );
return emitter;
}
public Emitter centerEmitter() {
Emitter emitter = GameScene.emitter();
emitter.pos( center() );
if (emitter != null) emitter.pos( center() );
return emitter;
}
public Emitter bottomEmitter() {
Emitter emitter = GameScene.emitter();
emitter.pos( x, y + height, width, 0 );
if (emitter != null) emitter.pos( x, y + height, width, 0 );
return emitter;
}