moritzruth/spigot-ttt
Archived
1
0
Fork 0
Code Activity

Fix round not ending when the Second Chance times out

Browse source
This commit is contained in:
Moritz Ruth 2020-06-21 15:18:43 +02:00
parent 0899e7a496
commit 1d638db078
No known key found for this signature in database
GPG key ID: AFD57E23E753841B
3 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/kotlin/de/moritzruth/spigot_ttt/game/GeneralGameListener.kt
View file

@ -21,7 +21,6 @@ import org.bukkit.event.EventHandler
import org.bukkit.event.EventPriority import org.bukkit.event.EventPriority
import org.bukkit.event.Listener import org.bukkit.event.Listener
import org.bukkit.event.block.Action import org.bukkit.event.block.Action
import org.bukkit.event.entity.EntityDamageByBlockEvent
import org.bukkit.event.entity.EntityDamageByEntityEvent import org.bukkit.event.entity.EntityDamageByEntityEvent
import org.bukkit.event.entity.EntityDamageEvent import org.bukkit.event.entity.EntityDamageEvent
import org.bukkit.event.entity.PlayerDeathEvent import org.bukkit.event.entity.PlayerDeathEvent
@ -85,11 +84,6 @@ object GeneralGameListener : Listener {
} }
} }
@EventHandler
fun onEntityDamageByBlock(event: EntityDamageByBlockEvent) {
println(event.damager?.type)
}
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
fun onEntityDamageHighest(event: EntityDamageEvent) { fun onEntityDamageHighest(event: EntityDamageEvent) {
if (event.entity !is Player) return if (event.entity !is Player) return

2
src/main/kotlin/de/moritzruth/spigot_ttt/game/corpses/CorpseListener.kt
View file

@ -36,7 +36,7 @@ object CorpseListener: Listener {
if ( if (
Duration.between(tttCorpse.timestamp, Instant.now()).toMillis() < 200 || Duration.between(tttCorpse.timestamp, Instant.now()).toMillis() < 200 ||
event.player.location.distance(tttCorpse.location) > 1.5 event.player.location.distance(tttCorpse.location) > 2.0
) return ) return
if (event.player.inventory.itemInMainHand.type != Material.AIR) if (event.player.inventory.itemInMainHand.type != Material.AIR)

1
src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/SecondChance.kt
View file

@ -99,6 +99,7 @@ object SecondChance: TTTItem<SecondChance.Instance>(
}, 0, 1) }, 0, 1)
private fun onTimeout() { private fun onTimeout() {
instance.preventRoundEnd = false
try { try {
PlayerManager.letRemainingRoleGroupWin() PlayerManager.letRemainingRoleGroupWin()
} catch (e: IllegalStateException) {} } catch (e: IllegalStateException) {}