From 124480f96bb8d5810f328bb05ccf9b771ce8b182 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=82=A4=EC=97=90=EB=A5=B4?= <44261958+Kieaer@users.noreply.github.com> Date: Sat, 9 Nov 2019 00:17:29 +0900 Subject: [PATCH 1/4] Update EventType.java --- core/src/io/anuke/mindustry/game/EventType.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/core/src/io/anuke/mindustry/game/EventType.java b/core/src/io/anuke/mindustry/game/EventType.java index fef2556d35..189ea60de4 100644 --- a/core/src/io/anuke/mindustry/game/EventType.java +++ b/core/src/io/anuke/mindustry/game/EventType.java @@ -126,9 +126,19 @@ public class EventType{ } - /** Called when a player withdraws items from a block. Tutorial only.*/ + /** Called when the player withdraws items from a block. */ public static class WithdrawEvent{ + public final Tile tile; + public final Player player; + public final Item item; + public final int amount; + public WithdrawEvent(Tile tile, Player player, Item item, int amount){ + this.tile = tile; + this.player = player; + this.item = item; + this.amount = amount; + } } /** Called when a player deposits items to a block.*/ From 7871b5bdaac59e668ab5aa040d6b689441f5ede8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=82=A4=EC=97=90=EB=A5=B4?= <44261958+Kieaer@users.noreply.github.com> Date: Sat, 9 Nov 2019 00:18:41 +0900 Subject: [PATCH 2/4] Update BlockInventoryFragment.java --- .../anuke/mindustry/ui/fragments/BlockInventoryFragment.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java index 1c663f2b4a..094b56026a 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java @@ -42,6 +42,7 @@ public class BlockInventoryFragment extends Fragment{ int removed = tile.block().removeStack(tile, item, amount); player.addItem(item, removed); + Events.fire(new WithdrawEvent(tile, player, item, amount)); for(int j = 0; j < Mathf.clamp(removed / 3, 1, 8); j++){ Time.run(j * 3f, () -> Call.transferItemEffect(item, tile.drawx(), tile.drawy(), player)); } @@ -100,7 +101,7 @@ public class BlockInventoryFragment extends Fragment{ holding = false; holdTime = 0f; - Events.fire(new WithdrawEvent()); + Events.fire(new WithdrawEvent(tile, player, item, amount)); } } @@ -153,7 +154,7 @@ public class BlockInventoryFragment extends Fragment{ lastItem = item; holding = true; holdTime = 0f; - Events.fire(new WithdrawEvent()); + Events.fire(new WithdrawEvent(tile, player, item, amount)); } return true; } From 0c430527b85178ed0783836494becadf6aa9590e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=82=A4=EC=97=90=EB=A5=B4?= <44261958+Kieaer@users.noreply.github.com> Date: Sat, 9 Nov 2019 00:41:31 +0900 Subject: [PATCH 3/4] Fix error --- .../io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java index 094b56026a..05b7a1ea47 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java @@ -101,7 +101,7 @@ public class BlockInventoryFragment extends Fragment{ holding = false; holdTime = 0f; - Events.fire(new WithdrawEvent(tile, player, item, amount)); + Events.fire(new WithdrawEvent(tile, player, lastItem, amount)); } } From 1f5e773c776da94612723cfb79113674c7a34143 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 13 Dec 2019 23:15:49 -0500 Subject: [PATCH 4/4] Fixed double-event firing --- .../anuke/mindustry/ui/fragments/BlockInventoryFragment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java index 05b7a1ea47..a844e448f3 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java @@ -101,7 +101,7 @@ public class BlockInventoryFragment extends Fragment{ holding = false; holdTime = 0f; - Events.fire(new WithdrawEvent(tile, player, lastItem, amount)); + if(net.client()) Events.fire(new WithdrawEvent(tile, player, lastItem, amount)); } } @@ -154,7 +154,7 @@ public class BlockInventoryFragment extends Fragment{ lastItem = item; holding = true; holdTime = 0f; - Events.fire(new WithdrawEvent(tile, player, item, amount)); + if(net.client()) Events.fire(new WithdrawEvent(tile, player, item, amount)); } return true; }