Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import dev.lrxh.neptune.providers.manager.IService;
import dev.lrxh.neptune.utils.ConfigFile;
import lombok.Getter;

import org.bukkit.GameMode;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;

Expand Down Expand Up @@ -46,6 +48,7 @@ Item getItem(Hotbar inventory, int slot) {
public void giveItems(Player player) {
player.getInventory().clear();
ProfileState profileState = API.getProfile(player).getState();
if (API.getProfile(player).getMatch() == null && player.getGameMode() == GameMode.CREATIVE) return;
if (profileState.equals(ProfileState.IN_KIT_EDITOR)) return;

Hotbar inventory = items.get(profileState);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import dev.lrxh.neptune.API;
import dev.lrxh.neptune.Neptune;
import dev.lrxh.neptune.feature.hotbar.HotbarService;
import dev.lrxh.neptune.profile.data.ProfileState;
import dev.lrxh.neptune.profile.impl.Profile;
import dev.lrxh.neptune.utils.CC;
Expand Down Expand Up @@ -244,4 +245,13 @@ public void onRespawn(PlayerRespawnEvent event) {
Player player = event.getPlayer();
event.setRespawnLocation(player.getLocation());
}

@EventHandler
public void onGamemodeChange(PlayerGameModeChangeEvent event) {
Player player = event.getPlayer();
Profile profile = API.getProfile(player);
if (profile == null) return;
if (isPlayerNotInMatch(profile))
HotbarService.get().giveItems(player);
}
}