Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4
This commit is contained in:
commit
410ba675ea
@ -800,11 +800,13 @@ abstract class MatteryBlockEntity(p_155228_: BlockEntityType<*>, p_155229_: Bloc
|
|||||||
val level = event.level as? ServerLevel ?: return
|
val level = event.level as? ServerLevel ?: return
|
||||||
playerMap.remove(level)
|
playerMap.remove(level)
|
||||||
tickingMap.remove(level)
|
tickingMap.remove(level)
|
||||||
|
player2ResubCount.clear()
|
||||||
}
|
}
|
||||||
|
|
||||||
fun onServerStopping(event: ServerStoppingEvent) {
|
fun onServerStopping(event: ServerStoppingEvent) {
|
||||||
playerMap.clear()
|
playerMap.clear()
|
||||||
tickingMap.clear()
|
tickingMap.clear()
|
||||||
|
player2ResubCount.clear()
|
||||||
}
|
}
|
||||||
|
|
||||||
fun postLevelTick(event: LevelTickEvent) {
|
fun postLevelTick(event: LevelTickEvent) {
|
||||||
@ -845,6 +847,8 @@ abstract class MatteryBlockEntity(p_155228_: BlockEntityType<*>, p_155229_: Bloc
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun playerDisconnected(event: PlayerEvent.PlayerLoggedOutEvent) {
|
fun playerDisconnected(event: PlayerEvent.PlayerLoggedOutEvent) {
|
||||||
|
player2ResubCount.removeInt(event.entity as ServerPlayer)
|
||||||
|
|
||||||
for (tree in playerMap.values) {
|
for (tree in playerMap.values) {
|
||||||
tree.values.removeIf {
|
tree.values.removeIf {
|
||||||
it.unsubscribe(event.entity as ServerPlayer)
|
it.unsubscribe(event.entity as ServerPlayer)
|
||||||
|
Loading…
Reference in New Issue
Block a user