Skip to content

NPE fix #11

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

Merged
5GameMaker merged 2 commits into from
May 21, 2026
Merged

NPE fix #11

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5740885
NPE fix
RE-AST May 20, 2026
cdd9a0e
dropZone draw fix
RE-AST May 20, 2026
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
12 changes: 6 additions & 6 deletions src/main/java/mindurka/rules/Castle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ private Impl(RulesContext rc) {
int amount = obj.get("amount").asInt();
int interval = obj.get("interval").asInt();
Block block = Vars.content.block(obj.get("block").asString());
Item item = Vars.content.item(obj.get("item").asString().toLowerCase());
Item item = Vars.content.item(obj.get("item").asString());
miners.add(new Castle.CastleMiner(block, blockX, blockY, cost,amount,interval,item));
} catch (Exception e) {
Log.err("Failed to parse miners", e);
Expand Down Expand Up @@ -271,7 +271,7 @@ public void drawEditorGuides() {
Core.bundle.get("rules.mindurka.castle.item.cost")+": "+miner.cost+"\n"+
Core.bundle.get("rules.mindurka.castle.item.interval")+": "+miner.interval+"\n"+
Core.bundle.get("rules.mindurka.castle.item.amount")+": "+miner.amount+"\n"+
Core.bundle.get("rules.mindurka.castle.item")+": "+miner.item.emoji()+"("+miner.item+")";
Core.bundle.get("rules.mindurka.castle.item")+": "+(miner.item != null ? miner.item.emoji()+"("+miner.item+")" : "?");
layout.setText(Fonts.outline, label);

float cx = (sx + v2.x) / 2;
Expand Down Expand Up @@ -325,7 +325,7 @@ private void drawDropZones(TextureRegion icon){
Lines.stroke(lineScale);
Vec2 spawn = new Vec2(MVars.mapView.unproject((float)tile.x+0.5f,(float)tile.y+0.5f));
Vec2 v3 = new Vec2(MVars.mapView.unproject(tile.x,tile.y - rc.rules.dropZoneRadius / tilesize));
Lines.circle(spawn.x,spawn.y,(spawn.y - v3.y) / tilesize);
Lines.circle(spawn.x,spawn.y,(spawn.y - v3.y));
Draw.reset();
Draw.color(Color.white);
Vec2 corner1 = new Vec2(MVars.mapView.unproject(tile.x-1.5f,tile.y-1.25f));
Expand Down Expand Up @@ -712,7 +712,7 @@ private void saveBlocks() {
Jval.JsonMap obj = val.asObject();
obj.put("x", Jval.valueOf(block.x));
obj.put("y", Jval.valueOf(block.y));
obj.put("block", Jval.valueOf(String.valueOf(block.block)));
obj.put("block", Jval.valueOf(block.block.name));
obj.put("cost", Jval.valueOf(block.cost));
obj.put("invincible", Jval.valueOf(block.invincible));
array.add(val);
Expand All @@ -738,11 +738,11 @@ private void saveMiners() {
Jval.JsonMap obj = val.asObject();
obj.put("x", Jval.valueOf(miner.x));
obj.put("y", Jval.valueOf(miner.y));
obj.put("block", Jval.valueOf(String.valueOf(miner.block)));
obj.put("block", Jval.valueOf(miner.block.name));
obj.put("cost", Jval.valueOf(miner.cost));
obj.put("amount", Jval.valueOf(miner.amount));
obj.put("interval", Jval.valueOf(miner.interval));
obj.put("item", Jval.valueOf(String.valueOf(miner.item)));
obj.put("item", Jval.valueOf(miner.item.name));
array.add(val);
}
Vars.state.rules.tags.put(MINERS, array.toString());
Expand Down
Loading