Skip to content

Fix item consume for vanished players #23

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
TheMeinerLP merged 3 commits into from
Jul 19, 2025
Merged

Fix item consume for vanished players #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9e6528
feat: Keep the player's food level at max.
theShadowsDust Jul 19, 2025
9f057ab
fix: prevent players from consuming food while in vanish or invulnera…
theShadowsDust Jul 19, 2025
0f82e59
refactor: Set the required food level to 3 for saturating the player.
theShadowsDust Jul 19, 2025
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
27 changes: 18 additions & 9 deletions src/main/java/net/onelitefeather/stardust/listener/PlayerVanishListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
import net.onelitefeather.stardust.user.UserPropertyType;
import org.bukkit.Bukkit;
import org.bukkit.block.data.Powerable;
import org.bukkit.entity.*;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Item;
import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile;
import org.bukkit.event.Event;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
Expand All @@ -21,6 +24,7 @@
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.event.player.PlayerDropItemEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerItemConsumeEvent;
import org.bukkit.event.raid.RaidTriggerEvent;

import java.util.Arrays;
Expand Down Expand Up @@ -138,16 +142,21 @@ public void onTarget(EntityTargetEvent event) {
}
}

@EventHandler
public void onItemConsume(PlayerItemConsumeEvent event) {
var player = event.getPlayer();
User user = stardustPlugin.getUserService().getUser(player.getUniqueId());
if (user == null) return;
if (!user.isVanished()) return;
event.setCancelled(true);
}

@EventHandler
public void onFoodLevelChange(FoodLevelChangeEvent event) {
if (event.getEntity() instanceof Player player) {
try {
User user = stardustPlugin.getUserService().getUser(player.getUniqueId());
event.setCancelled(user != null && (user.isVanished() || player.isInvulnerable()));
} catch (Exception e) {
stardustPlugin.getLogger().throwing(PlayerVanishListener.class.getSimpleName(), "onFoodLevelChange", e);
}
}
if (!(event.getEntity() instanceof Player player)) return;
if (event.getFoodLevel() >= event.getEntity().getFoodLevel()) return; //Ignore food level increment
if (!player.isInvulnerable()) return;
event.setCancelled(true);
}

@EventHandler
Expand Down
14 changes: 13 additions & 1 deletion src/main/java/net/onelitefeather/stardust/task/UserTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import net.kyori.adventure.text.Component;
import net.onelitefeather.stardust.StardustPlugin;
import net.onelitefeather.stardust.util.PlayerUtil;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;

public class UserTask implements Runnable {
Expand All @@ -17,12 +18,14 @@ public UserTask(@NotNull StardustPlugin plugin) {
public void run() {
plugin.getServer().getOnlinePlayers().forEach(player -> {

if (player.isInvulnerable()) saturatePlayer(player);

var user = plugin.getUserService().getUser(player.getUniqueId());
if (user == null) return;

if (user.isVanished()) {
player.sendActionBar(Component.translatable("plugin.vanish-actionbar"));

saturatePlayer(player);
//Keep fly mode if the player's gamemode was changed to survival or adventure
if (!player.getAllowFlight() && !PlayerUtil.canEnterFlyMode(player)) {
player.setAllowFlight(true);
Expand All @@ -36,4 +39,13 @@ public void run() {
}
});
}

private void saturatePlayer(Player player) {
int requiredFoodLevel = 3; //Required food level for sprinting
if(player.getFoodLevel() <= requiredFoodLevel) {
player.setFoodLevel(20);
player.setSaturation(20);
player.setExhaustion(0);
}
}
}
Loading