forked from SteamWar/SteamWar
Fixes...
This commit is contained in:
+2
@@ -22,6 +22,8 @@ dealerPrice=Price: {0} Coins
|
|||||||
|
|
||||||
scoreboardTarget=Target: {0}
|
scoreboardTarget=Target: {0}
|
||||||
scoreboardTime=Time: {0}:{1}
|
scoreboardTime=Time: {0}:{1}
|
||||||
|
scoreboardCoins=Coins: {0}
|
||||||
|
|
||||||
ready=Ready
|
ready=Ready
|
||||||
notReady=Not ready
|
notReady=Not ready
|
||||||
isReady=Team {0} is ready!
|
isReady=Team {0} is ready!
|
||||||
+1
-1
@@ -10,7 +10,7 @@ notEnoughCoins=Du hast nicht genug Coins um dir das zu kaufen!
|
|||||||
gameStarting=Das Spiel beginnt in {0} Sekunden!
|
gameStarting=Das Spiel beginnt in {0} Sekunden!
|
||||||
gameStart=Start in {0}
|
gameStart=Start in {0}
|
||||||
gameStarted=Das Spiel beginnt!
|
gameStarted=Das Spiel beginnt!
|
||||||
timeRemaining=noch {0} Minuten!
|
timeRemaining=noch {0} Minuten!
|
||||||
gameEnded=Das Spiel ist vorbei!
|
gameEnded=Das Spiel ist vorbei!
|
||||||
draw=Keiner hat gewonnen!
|
draw=Keiner hat gewonnen!
|
||||||
chat={0}» {1}
|
chat={0}» {1}
|
||||||
@@ -13,11 +13,14 @@ import org.bukkit.entity.EntityType
|
|||||||
import org.bukkit.event.EventHandler
|
import org.bukkit.event.EventHandler
|
||||||
import org.bukkit.event.Listener
|
import org.bukkit.event.Listener
|
||||||
import org.bukkit.event.entity.EntityExplodeEvent
|
import org.bukkit.event.entity.EntityExplodeEvent
|
||||||
|
import org.bukkit.event.entity.EntityPickupItemEvent
|
||||||
import org.bukkit.event.entity.PlayerDeathEvent
|
import org.bukkit.event.entity.PlayerDeathEvent
|
||||||
|
import org.bukkit.event.player.PlayerAttemptPickupItemEvent
|
||||||
import org.bukkit.event.player.PlayerDropItemEvent
|
import org.bukkit.event.player.PlayerDropItemEvent
|
||||||
import org.bukkit.event.player.PlayerInteractEntityEvent
|
import org.bukkit.event.player.PlayerInteractEntityEvent
|
||||||
import org.bukkit.event.player.PlayerJoinEvent
|
import org.bukkit.event.player.PlayerJoinEvent
|
||||||
import org.bukkit.event.player.PlayerMoveEvent
|
import org.bukkit.event.player.PlayerMoveEvent
|
||||||
|
import org.bukkit.event.player.PlayerPickupItemEvent
|
||||||
import org.bukkit.event.player.PlayerQuitEvent
|
import org.bukkit.event.player.PlayerQuitEvent
|
||||||
|
|
||||||
object IngameListener: Listener {
|
object IngameListener: Listener {
|
||||||
@@ -63,6 +66,17 @@ object IngameListener: Listener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@EventHandler
|
||||||
|
fun onPickupCoins(e: PlayerAttemptPickupItemEvent) {
|
||||||
|
if (e.item.itemStack == DealerInventory.coins) {
|
||||||
|
TNTLeagueGame.getTeam(e.player)?.coins?.plus(e.item.itemStack.amount)
|
||||||
|
|
||||||
|
e.item.itemStack.amount = 0
|
||||||
|
e.isCancelled = true
|
||||||
|
e.flyAtPlayer = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private fun getTeamByTargetLocation(location: Location): TNTLeagueTeam? =
|
private fun getTeamByTargetLocation(location: Location): TNTLeagueTeam? =
|
||||||
when (location) {
|
when (location) {
|
||||||
in TNTLeagueWorldConfig.redTeam.target -> TNTLeagueGame.redTeam
|
in TNTLeagueWorldConfig.redTeam.target -> TNTLeagueGame.redTeam
|
||||||
|
|||||||
@@ -63,6 +63,8 @@ data class TNTLeagueTeam(val config: TNTLeagueWorldConfig.TeamConfig, private va
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var coins: Int = 0
|
||||||
|
|
||||||
val opposite: TNTLeagueTeam
|
val opposite: TNTLeagueTeam
|
||||||
get() = when (team) {
|
get() = when (team) {
|
||||||
Team.BLUE -> TNTLeagueGame.redTeam
|
Team.BLUE -> TNTLeagueGame.redTeam
|
||||||
|
|||||||
@@ -47,6 +47,8 @@ data class TNTLeagueScoreboard(val p: Player): ScoreboardCallback {
|
|||||||
lines.add(translate("scoreboardTeam", translate(name).colorByTeam(this), (targetedBlocks - damagedBlocks).toString().yellow()).gray())
|
lines.add(translate("scoreboardTeam", translate(name).colorByTeam(this), (targetedBlocks - damagedBlocks).toString().yellow()).gray())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TNTLeagueGame.getTeam(p)?.coins?.let { lines.add(translate("scoreboardCoins", it.toString().yellow()).gray()) }
|
||||||
|
|
||||||
lines.add(Component.space().gray())
|
lines.add(Component.space().gray())
|
||||||
|
|
||||||
return lines
|
return lines
|
||||||
|
|||||||
Reference in New Issue
Block a user