🐛 (wayzer/map/betterTeam) 状态未重置bug;原版分队可能不均衡bug

way-zer · way-zer · commit 52e1cbeb56bc · 2023-01-07T20:48:09.000+08:00
diff --git a/scripts/wayzer/map/betterTeam.kts b/scripts/wayzer/map/betterTeam.kts
@@ -51,6 +51,10 @@ onEnable {
     updateBannedTeam(true)
 }
 listen<EventType.PlayEvent> { updateBannedTeam(true) }
+listen<EventType.ResetEvent> {
+    bannedTeam = emptySet()
+    teams.clear()
+}
 //custom gameover
 listen<EventType.BlockDestroyEvent> { e ->
     if (state.gameOver || !state.rules.pvp) return@listen
@@ -63,8 +67,10 @@ listen<EventType.BlockDestroyEvent> { e ->
             }
         }
 }
-listen<EventType.ResetEvent> {
-    bannedTeam = emptySet()
+//fix bug
+listen<EventType.PlayerConnectionConfirmed> {
+    //As team assigned in connect may be wrong.
+    changeTeam(it.player)
 }
 
 fun updateBannedTeam(force: Boolean = false) {

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,10 @@ onEnable {`
`51`	`51`	`updateBannedTeam(true)`
`52`	`52`	`}`
`53`	`53`	`listen<EventType.PlayEvent> { updateBannedTeam(true) }`
	`54`	`+listen<EventType.ResetEvent> {`
	`55`	`+ bannedTeam = emptySet()`
	`56`	`+ teams.clear()`
	`57`	`+}`
`54`	`58`	`//custom gameover`
`55`	`59`	`listen<EventType.BlockDestroyEvent> { e ->`
`56`	`60`	`if (state.gameOver \|\| !state.rules.pvp) return@listen`
`@@ -63,8 +67,10 @@ listen<EventType.BlockDestroyEvent> { e ->`
`63`	`67`	`}`
`64`	`68`	`}`
`65`	`69`	`}`
`66`		`-listen<EventType.ResetEvent> {`
`67`		`- bannedTeam = emptySet()`
	`70`	`+//fix bug`
	`71`	`+listen<EventType.PlayerConnectionConfirmed> {`
	`72`	`+ //As team assigned in connect may be wrong.`
	`73`	`+ changeTeam(it.player)`
`68`	`74`	`}`
`69`	`75`
`70`	`76`	`fun updateBannedTeam(force: Boolean = false) {`