Skip to content

fixing: muder mystery hunger and gold dropping #674

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
ItzKatze merged 1 commit into from
Jan 10, 2026
Merged

fixing: muder mystery hunger and gold dropping #674

Show file tree
Hide file tree
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
14 changes: 1 addition & 13 deletions ...dermysterygame/src/main/java/net/swofty/type/murdermysterygame/events/ActionGoldDrop.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package net.swofty.type.murdermysterygame.events;

import net.minestom.server.entity.ItemEntity;
import net.minestom.server.event.item.ItemDropEvent;
import net.minestom.server.item.Material;
import net.swofty.type.murdermysterygame.TypeMurderMysteryGameLoader;
Expand All @@ -11,8 +10,6 @@
import net.swofty.type.generic.event.HypixelEvent;
import net.swofty.type.generic.event.HypixelEventClass;

import java.time.Duration;

public class ActionGoldDrop implements HypixelEventClass {

@HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = false)
Expand All @@ -29,17 +26,8 @@ public void run(ItemDropEvent event) {

Material material = event.getItemStack().material();

// Allow gold dropping - create shared ItemEntity that anyone can pick up
if (material == Material.GOLD_INGOT) {
ItemEntity itemEntity = new ItemEntity(event.getItemStack());
itemEntity.setInstance(
player.getInstance(),
player.getPosition().add(0, player.getEyeHeight(), 0)
);
itemEntity.setVelocity(
player.getPosition().add(0, 0.3, 0).direction().mul(6)
);
itemEntity.setPickupDelay(Duration.ofMillis(500));
event.setCancelled(true);
return;
}

Expand Down
47 changes: 47 additions & 0 deletions ...ygame/src/main/java/net/swofty/type/murdermysterygame/events/ActionGoldInventoryMove.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package net.swofty.type.murdermysterygame.events;

import net.minestom.server.event.inventory.InventoryItemChangeEvent;
import net.minestom.server.item.ItemStack;
import net.minestom.server.item.Material;
import net.swofty.type.murdermysterygame.TypeMurderMysteryGameLoader;
import net.swofty.type.murdermysterygame.game.Game;
import net.swofty.type.murdermysterygame.game.GameStatus;
import net.swofty.type.murdermysterygame.user.MurderMysteryPlayer;
import net.swofty.type.generic.event.EventNodes;
import net.swofty.type.generic.event.HypixelEvent;
import net.swofty.type.generic.event.HypixelEventClass;

public class ActionGoldInventoryMove implements HypixelEventClass {

@HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = false)
public void run(InventoryItemChangeEvent event) {
if (event.getInventory().getViewers().isEmpty()) return;
MurderMysteryPlayer player = (MurderMysteryPlayer) event.getInventory().getViewers().stream().findFirst().orElse(null);
if (player == null) return;

Game game = TypeMurderMysteryGameLoader.getPlayerGame(player);
if (game == null) return;
if (game.getGameStatus() != GameStatus.IN_PROGRESS) return;

int totalGold = 0;
for (int i = 0; i < 36; i++) {
ItemStack stack = player.getInventory().getItemStack(i);
if (stack.material() == Material.GOLD_INGOT) {
totalGold += stack.amount();
if (i != 8) {
player.getInventory().setItemStack(i, ItemStack.AIR);
}
}
}

if (totalGold > 0) {
player.getInventory().setItemStack(8, ItemStack.of(Material.GOLD_INGOT, totalGold));
} else {
ItemStack slot8Item = player.getInventory().getItemStack(8);
if (slot8Item.material() == Material.GOLD_INGOT) {
player.getInventory().setItemStack(8, ItemStack.AIR);
}
}
}
}

47 changes: 47 additions & 0 deletions ...rmysterygame/src/main/java/net/swofty/type/murdermysterygame/events/ActionPlayerTick.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package net.swofty.type.murdermysterygame.events;

import net.minestom.server.event.player.PlayerTickEvent;
import net.minestom.server.item.ItemStack;
import net.minestom.server.item.Material;
import net.swofty.type.murdermysterygame.TypeMurderMysteryGameLoader;
import net.swofty.type.murdermysterygame.game.Game;
import net.swofty.type.murdermysterygame.game.GameStatus;
import net.swofty.type.murdermysterygame.user.MurderMysteryPlayer;
import net.swofty.type.generic.event.EventNodes;
import net.swofty.type.generic.event.HypixelEvent;
import net.swofty.type.generic.event.HypixelEventClass;

public class ActionPlayerTick implements HypixelEventClass {

@HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = false)
public void run(PlayerTickEvent event) {
if (!(event.getPlayer() instanceof MurderMysteryPlayer player)) return;

Game game = TypeMurderMysteryGameLoader.getPlayerGame(player);
if (game == null) return;

if (game.getGameStatus() == GameStatus.IN_PROGRESS || game.getGameStatus() == GameStatus.ENDING) {
if (player.getFood() < 20) {
player.setFood(20);
player.setFoodSaturation(20.0f);
}

ItemStack slot8Item = player.getInventory().getItemStack(8);
if (slot8Item.material() != Material.GOLD_INGOT) {
int totalGold = 0;
for (int i = 0; i < 36; i++) {
ItemStack stack = player.getInventory().getItemStack(i);
if (stack.material() == Material.GOLD_INGOT) {
totalGold += stack.amount();
if (i != 8) {
player.getInventory().setItemStack(i, ItemStack.AIR);
}
}
}
if (totalGold > 0) {
player.getInventory().setItemStack(8, ItemStack.of(Material.GOLD_INGOT, totalGold));
}
}
}
}
}
7 changes: 7 additions & 0 deletions type.murdermysterygame/src/main/java/net/swofty/type/murdermysterygame/game/Game.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,8 @@ private void setupPlayerForWaiting(MurderMysteryPlayer player) {
player.setGameMode(GameMode.ADVENTURE);
player.setEliminated(false);
player.resetGold();
player.setFood(20);
player.setFoodSaturation(20.0f);
}

private Pos getWaitingPosition() {
Expand All @@ -351,6 +353,9 @@ private void setupPlayerForGame(MurderMysteryPlayer player, GameRole role) {
Pos spawnPos = getRandomSpawnPosition();
player.teleport(spawnPos);

player.setFood(20);
player.setFoodSaturation(20.0f);

if (role == GameRole.DETECTIVE) {
weaponManager.giveDetectiveBow(player);
}
Expand All @@ -374,6 +379,8 @@ private void setupPlayerForSpectator(MurderMysteryPlayer player) {

player.setAllowFlying(true);
player.setFlying(true);
player.setFood(20);
player.setFoodSaturation(20.0f);
}

private void setupHiddenNametags() {
Expand Down
38 changes: 25 additions & 13 deletions type.murdermysterygame/src/main/java/net/swofty/type/murdermysterygame/gold/GoldManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public void startSpawning() {

player.sendPacket(new CollectItemPacket(goldEntity.getEntityId(), player.getEntityId(), 1));

player.getInventory().addItemStack(ItemStack.of(Material.GOLD_INGOT, 1));
addGoldToSlot(player, 1);

player.sendMessage(Component.text("+1 Gold", NamedTextColor.GOLD));

Expand Down Expand Up @@ -119,7 +119,7 @@ public boolean collectGold(MurderMysteryPlayer player, Entity goldEntity) {
spawnedGold.remove(goldEntity);
goldEntity.remove();

player.getInventory().addItemStack(ItemStack.of(Material.GOLD_INGOT, 1));
addGoldToSlot(player, 1);

trackGoldAchievements(player, 1);

Expand Down Expand Up @@ -160,21 +160,22 @@ public List<Entity> getSpawnedGold() {
}

public int countGoldInInventory(MurderMysteryPlayer player) {
return Arrays.stream(player.getInventory().getItemStacks())
.filter(stack -> stack.material() == Material.GOLD_INGOT)
.mapToInt(ItemStack::amount)
.sum();
ItemStack slot8Item = player.getInventory().getItemStack(8);
if (slot8Item.material() == Material.GOLD_INGOT) {
return slot8Item.amount();
}
return 0;
}

public void removeGoldFromInventory(MurderMysteryPlayer player, int amount) {
PlayerInventory inventory = player.getInventory();
int remaining = amount;
for (int i = 0; i < inventory.getSize() && remaining > 0; i++) {
ItemStack stack = inventory.getItemStack(i);
if (stack.material() == Material.GOLD_INGOT) {
int remove = Math.min(stack.amount(), remaining);
inventory.setItemStack(i, stack.amount() > remove ? stack.withAmount(stack.amount() - remove) : ItemStack.AIR);
remaining -= remove;
ItemStack slot8Item = inventory.getItemStack(8);
if (slot8Item.material() == Material.GOLD_INGOT) {
int remove = Math.min(slot8Item.amount(), amount);
if (slot8Item.amount() > remove) {
inventory.setItemStack(8, slot8Item.withAmount(slot8Item.amount() - remove));
} else {
inventory.setItemStack(8, ItemStack.AIR);
}
}
}
Expand All @@ -186,4 +187,15 @@ public void checkPlayerGoldForBow(MurderMysteryPlayer player) {
game.getWeaponManager().giveInnocentBow(player);
}
}

private void addGoldToSlot(MurderMysteryPlayer player, int amount) {
PlayerInventory inventory = player.getInventory();
ItemStack slot8Item = inventory.getItemStack(8);

if (slot8Item.material() == Material.GOLD_INGOT) {
inventory.setItemStack(8, slot8Item.withAmount(slot8Item.amount() + amount));
} else {
inventory.setItemStack(8, ItemStack.of(Material.GOLD_INGOT, amount));
}
}
}