fix: Keep track of player and pass them when destroying block after gold rush #26

Author: BlayTheNinth

common/src/main/java/net/blay09/mods/littlejoys/client/handler/GoldRushClientHandler.java

@@ -77,7 +77,7 @@ public static void initialize() {
     public static void addActiveGoldRush(BlockPos pos) {
         final var level = Minecraft.getInstance().level;
         if (level != null) {
-            activeGoldRushes.put(level.dimension(), pos, new GoldRushInstance(pos, level.getBlockState(pos), Optional.empty(), -1, -1));
+            activeGoldRushes.put(level.dimension(), pos, new GoldRushInstance(pos, level.getBlockState(pos), Optional.empty(), -1, -1, null));
         }
     }
 

common/src/main/java/net/blay09/mods/littlejoys/handler/GoldRushHandler.java

@@ -74,7 +74,8 @@ public static void initialize() {
                             event.getState(),
                             Optional.of(recipe.lootTable()),
                             (int) Math.floor(20 * recipe.seconds()),
-                            recipe.maxDropsPerSecond() == -1 ? 0 : (int) Math.floor(20 / recipe.maxDropsPerSecond()));
+                            recipe.maxDropsPerSecond() == -1 ? 0 : (int) Math.floor(20 / recipe.maxDropsPerSecond()),
+                            serverPlayer);
                     Balm.getNetworking().sendToTracking(((ServerLevel) level), event.getPos(), new ClientboundGoldRushPacket(event.getPos(), true));
                     event.getPlayer().awardStat(ModStats.goldRushesTriggered);
                     activeGoldRushes.put(level.dimension(), event.getPos(), activeGoldRush);
@@ -106,7 +107,7 @@ public static void initialize() {
                 goldRush.setDropCooldownTicks(goldRush.getDropCooldownTicks() - 1);
                 if (goldRush.getTicksPassed() >= goldRush.getMaxTicks()) {
                     if (level.getBlockState(goldRush.getPos()).equals(goldRush.getInitialState())) {
-                        level.destroyBlock(goldRush.getPos(), true);
+                        level.destroyBlock(goldRush.getPos(), true, goldRush.getPlayer());
                     }
                     Balm.getNetworking().sendToAll(level.getServer(), new ClientboundGoldRushPacket(goldRush.getPos(), false));
                 }

common/src/main/java/net/blay09/mods/littlejoys/handler/GoldRushInstance.java

@@ -2,8 +2,11 @@
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.LootTable;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Optional;
 
@@ -13,15 +16,17 @@ public final class GoldRushInstance {
     private final ResourceKey<LootTable> lootTable;
     private final int maxTicks;
     private final int ticksPerDrop;
+    private final Player player;
     private int ticksPassed;
     private int dropCooldownTicks;
 
-    public GoldRushInstance(BlockPos pos, BlockState initialState, @SuppressWarnings("OptionalUsedAsFieldOrParameterType") Optional<ResourceKey<LootTable>> lootTable, int maxTicks, int ticksPerDrop) {
+    public GoldRushInstance(BlockPos pos, BlockState initialState, @SuppressWarnings("OptionalUsedAsFieldOrParameterType") Optional<ResourceKey<LootTable>> lootTable, int maxTicks, int ticksPerDrop, @Nullable Player player) {
         this.pos = pos;
         this.initialState = initialState;
         this.lootTable = lootTable.orElse(null);
         this.maxTicks = maxTicks;
         this.ticksPerDrop = ticksPerDrop;
+        this.player = player;
     }
 
     public BlockPos getPos() {
@@ -44,6 +49,11 @@ public int getTicksPerDrop() {
         return ticksPerDrop;
     }
 
+    @Nullable
+    public Player getPlayer() {
+        return player;
+    }
+
     public int getTicksPassed() {
         return ticksPassed;
     }