Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

IDE-14 XML issue with WhenBounceOff-Brick (Catblocks related) #4596

Merged
merged 1 commit into from
Sep 26, 2023
Merged

IDE-14 XML issue with WhenBounceOff-Brick (Catblocks related) #4596

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions catroid/src/main/java/org/catrobat/catroid/content/WhenBounceOffScript.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,19 @@
public class WhenBounceOffScript extends Script {

private static final long serialVersionUID = 1L;
private String spriteToBounceOffName;
private String spriteToBounceOffName = "";

private transient Sprite spriteToBounceOff;

public WhenBounceOffScript() {
}

public WhenBounceOffScript(String spriteToBounceOffName) {
this.spriteToBounceOffName = spriteToBounceOffName;
if(spriteToBounceOffName == null) {
this.spriteToBounceOffName = "";
} else {
this.spriteToBounceOffName = spriteToBounceOffName;
}
}

@Override
Expand All @@ -51,21 +55,26 @@ public ScriptBrick getScriptBrick() {
}

public String getSpriteToBounceOffName() {
if(spriteToBounceOffName.isEmpty()) {
return null;
}
return spriteToBounceOffName;
}

public void setSpriteToBounceOffName(String spriteToCollideWithName) {
this.spriteToBounceOffName = spriteToCollideWithName;
if(spriteToCollideWithName == null) {
this.spriteToBounceOffName = "";
} else {
this.spriteToBounceOffName = spriteToCollideWithName;
}
updateSpriteToCollideWith(ProjectManager.getInstance().getCurrentlyEditedScene());
}

public void updateSpriteToCollideWith(Scene scene) {
if (spriteToBounceOffName == null) {
spriteToBounceOffName = null;
} else {
if(!spriteToBounceOffName.isEmpty()){
spriteToBounceOff = scene.getSprite(spriteToBounceOffName);
if (spriteToBounceOff == null) {
spriteToBounceOffName = null;
spriteToBounceOffName = "";
}
}
}
Expand Down