Jaki/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Fix IngameListener and StartCommand

Browse Source
This commit is contained in:
YoyoNow
2026-04-05 12:30:55 +02:00
parent 97071165cd
commit 34da59714e
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TowerRun/src/de/steamwar/towerrun/commands/StartCommand.java
+3
View File
@@ -22,6 +22,7 @@ package de.steamwar.towerrun.commands;
import de.steamwar.command.SWCommand; import de.steamwar.command.SWCommand;
import de.steamwar.command.TypeValidator; import de.steamwar.command.TypeValidator;
import de.steamwar.linkage.Linked; import de.steamwar.linkage.Linked;
import de.steamwar.linkage.LinkedInstance;
import de.steamwar.sql.SteamwarUser; import de.steamwar.sql.SteamwarUser;
import de.steamwar.sql.UserPerm; import de.steamwar.sql.UserPerm;
import de.steamwar.towerrun.TowerRun; import de.steamwar.towerrun.TowerRun;
@@ -30,6 +31,8 @@ import org.bukkit.entity.Player;
@Linked @Linked
public class StartCommand extends SWCommand { public class StartCommand extends SWCommand {
@LinkedInstance
private LobbyCountdown countdown; private LobbyCountdown countdown;
public StartCommand() { public StartCommand() {
TowerRun/src/de/steamwar/towerrun/listener/IngameListener.java
+9 -2
View File
@@ -42,6 +42,7 @@ import org.bukkit.event.entity.EntityRegainHealthEvent;
import org.bukkit.event.entity.ItemSpawnEvent; import org.bukkit.event.entity.ItemSpawnEvent;
import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
import java.util.*; import java.util.*;
@@ -158,10 +159,16 @@ public class IngameListener extends GameStateBukkitListener {
public void onKeyUse(PlayerInteractEvent event) { public void onKeyUse(PlayerInteractEvent event) {
if (!event.hasItem()) return; if (!event.hasItem()) return;
if (event.getItem().getType() != Material.LEVER) return; if (event.getItem().getType() != Material.LEVER) return;
event.setCancelled(true);
if (!event.hasBlock()) return; if (!event.hasBlock()) return;
if (event.getClickedBlock().getType() != Material.IRON_DOOR) return; if (event.getClickedBlock().getType() != Material.IRON_DOOR) return;
event.getPlayer().getInventory().remove(event.getItem()); if (event.getHand() == null) return;
event.setCancelled(true);
ItemStack itemStack = event.getItem();
itemStack.setAmount(event.getItem().getAmount() - 1);
switch (event.getHand()) {
case OFF_HAND -> event.getPlayer().getInventory().setItemInOffHand(itemStack);
case HAND -> event.getPlayer().getInventory().setItemInMainHand(itemStack);
}
event.getClickedBlock().breakNaturally(); event.getClickedBlock().breakNaturally();
} }