From 815a483d2c9513b25c98b0c55d8b16969fbabd40 Mon Sep 17 00:00:00 2001 From: slava0135 Date: Thu, 26 Nov 2020 19:38:25 +0300 Subject: [PATCH 1/7] typo in Fires: /** Start a fire on the tile. If there already is a file there, refreshes its lifetime. */ --- core/src/mindustry/entities/Fires.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/entities/Fires.java b/core/src/mindustry/entities/Fires.java index 754a8766b9..2ae2253356 100644 --- a/core/src/mindustry/entities/Fires.java +++ b/core/src/mindustry/entities/Fires.java @@ -15,7 +15,7 @@ public class Fires{ private static final float baseLifetime = 1000f; private static final IntMap map = new IntMap<>(); - /** Start a fire on the tile. If there already is a file there, refreshes its lifetime. */ + /** Start a fire on the tile. If there already is a fire there, refreshes its lifetime. */ public static void create(Tile tile){ if(net.client() || tile == null || !state.rules.fire) return; //not clientside. From 724a0018b82e740abd8dd1d61178465b9e1e4cdb Mon Sep 17 00:00:00 2001 From: slava0135 Date: Sat, 28 Nov 2020 20:39:09 +0300 Subject: [PATCH 2/7] unit payload improvements --- .../world/blocks/distribution/PayloadConveyor.java | 12 ++++++++++++ .../world/blocks/production/PayloadAcceptor.java | 13 +++++++++++++ 2 files changed, 25 insertions(+) diff --git a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java index c2c014d969..edb9f87d47 100644 --- a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java @@ -234,6 +234,18 @@ public class PayloadConveyor extends Block{ updatePayload(); } + @Override + public void onDestroyed() { + super.onDestroyed(); + if (item != null) item.dump(); + } + + @Override + public void onRemoved() { + super.onRemoved(); + if (item != null) item.dump(); + } + @Override public void write(Writes write){ super.write(write); diff --git a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java index 512eeebdad..697f44ab85 100644 --- a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java +++ b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java @@ -82,6 +82,18 @@ public class PayloadAcceptor extends Block{ return t; } + @Override + public void onDestroyed() { + super.onDestroyed(); + if (payload != null) payload.dump(); + } + + @Override + public void onRemoved() { + super.onRemoved(); + if (payload != null) payload.dump(); + } + public boolean blends(int direction){ return PayloadAcceptor.blends(this, direction); } @@ -126,6 +138,7 @@ public class PayloadAcceptor extends Block{ } } + public void dumpPayload(){ if(payload.dump()){ payload = null; From 6dc2486ce0660b498fe6603928480218daaf7782 Mon Sep 17 00:00:00 2001 From: slava0135 Date: Sat, 28 Nov 2020 21:06:20 +0300 Subject: [PATCH 3/7] oopsie --- core/src/mindustry/world/blocks/production/PayloadAcceptor.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java index 697f44ab85..9e6a644ea5 100644 --- a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java +++ b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java @@ -138,7 +138,6 @@ public class PayloadAcceptor extends Block{ } } - public void dumpPayload(){ if(payload.dump()){ payload = null; From ee3348d160d6d55df98618bd4b37a3861578a9fb Mon Sep 17 00:00:00 2001 From: slava0135 Date: Sat, 28 Nov 2020 21:10:12 +0300 Subject: [PATCH 4/7] oopsie x2 --- .../mindustry/world/blocks/distribution/PayloadConveyor.java | 4 ++-- .../mindustry/world/blocks/production/PayloadAcceptor.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java index edb9f87d47..8de59475ff 100644 --- a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java @@ -235,13 +235,13 @@ public class PayloadConveyor extends Block{ } @Override - public void onDestroyed() { + public void onDestroyed(){ super.onDestroyed(); if (item != null) item.dump(); } @Override - public void onRemoved() { + public void onRemoved(){ super.onRemoved(); if (item != null) item.dump(); } diff --git a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java index 9e6a644ea5..d0f7cbf164 100644 --- a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java +++ b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java @@ -83,13 +83,13 @@ public class PayloadAcceptor extends Block{ } @Override - public void onDestroyed() { + public void onDestroyed(){ super.onDestroyed(); if (payload != null) payload.dump(); } @Override - public void onRemoved() { + public void onRemoved(){ super.onRemoved(); if (payload != null) payload.dump(); } From 699750762f0dc91dbbafdae6a0626a0661167d27 Mon Sep 17 00:00:00 2001 From: slava0135 Date: Sat, 28 Nov 2020 21:38:50 +0300 Subject: [PATCH 5/7] removing unnecessary stuff --- .../world/blocks/distribution/PayloadConveyor.java | 6 ------ .../mindustry/world/blocks/production/PayloadAcceptor.java | 7 +------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java index 8de59475ff..241cc27476 100644 --- a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java @@ -234,12 +234,6 @@ public class PayloadConveyor extends Block{ updatePayload(); } - @Override - public void onDestroyed(){ - super.onDestroyed(); - if (item != null) item.dump(); - } - @Override public void onRemoved(){ super.onRemoved(); diff --git a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java index d0f7cbf164..205437928e 100644 --- a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java +++ b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java @@ -11,6 +11,7 @@ import mindustry.graphics.*; import mindustry.world.*; import mindustry.world.blocks.payloads.*; +import static arc.util.Timer.post; import static mindustry.Vars.*; public class PayloadAcceptor extends Block{ @@ -82,12 +83,6 @@ public class PayloadAcceptor extends Block{ return t; } - @Override - public void onDestroyed(){ - super.onDestroyed(); - if (payload != null) payload.dump(); - } - @Override public void onRemoved(){ super.onRemoved(); From b0477394e6ac5c12896245712999d507f888f051 Mon Sep 17 00:00:00 2001 From: slava0135 Date: Sat, 28 Nov 2020 21:45:42 +0300 Subject: [PATCH 6/7] oopsie x3 --- core/src/mindustry/world/blocks/production/PayloadAcceptor.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java index 205437928e..a590c0caf6 100644 --- a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java +++ b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java @@ -11,7 +11,6 @@ import mindustry.graphics.*; import mindustry.world.*; import mindustry.world.blocks.payloads.*; -import static arc.util.Timer.post; import static mindustry.Vars.*; public class PayloadAcceptor extends Block{ From e6078bd4f6f0d949c8956bb9cbb882cd47bbc103 Mon Sep 17 00:00:00 2001 From: slava0135 Date: Sat, 28 Nov 2020 21:49:59 +0300 Subject: [PATCH 7/7] oopsie x4 --- .../mindustry/world/blocks/distribution/PayloadConveyor.java | 2 +- core/src/mindustry/world/blocks/production/PayloadAcceptor.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java index 241cc27476..99139638c3 100644 --- a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java @@ -237,7 +237,7 @@ public class PayloadConveyor extends Block{ @Override public void onRemoved(){ super.onRemoved(); - if (item != null) item.dump(); + if(item != null) item.dump(); } @Override diff --git a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java index a590c0caf6..2852d00a13 100644 --- a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java +++ b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java @@ -85,7 +85,7 @@ public class PayloadAcceptor extends Block{ @Override public void onRemoved(){ super.onRemoved(); - if (payload != null) payload.dump(); + if(payload != null) payload.dump(); } public boolean blends(int direction){