Anvilcraft/HexCasting
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix inconsistencies with teleport updating

Browse source
This commit is contained in:
yrsegal@gmail.com 2022-07-31 09:15:59 -04:00
parent a5d25eba2e
commit 4ceb5416fb
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/great/OpTeleport.kt
View file

@ -91,21 +91,29 @@ object OpTeleport : SpellOperator {
cursor = cursor.vehicle cursor = cursor.vehicle
} }
val playersToUpdate = mutableListOf<ServerPlayer>()
if (stickyTeleport) { if (stickyTeleport) {
// this handles teleporting the passengers // this handles teleporting the passengers
val target = base!!.position().add(delta) val target = base!!.position().add(delta)
base.teleportTo(target.x, target.y, target.z) base.teleportTo(target.x, target.y, target.z)
base.indirectPassengers
.filterIsInstance<ServerPlayer>()
.forEach(playersToUpdate::add)
} else { } else {
// Break it into two stacks // Break it into two stacks
teleportee.stopRiding() teleportee.stopRiding()
teleportee.firstPassenger?.stopRiding() teleportee.passengers.forEach(Entity::stopRiding)
teleportee.setPos(teleportee.position().add(delta)) teleportee.setPos(teleportee.position().add(delta))
if (teleportee is ServerPlayer) {
playersToUpdate.add(teleportee)
}
} }
teleportee.setPos(teleportee.position().add(delta)) teleportee.setPos(teleportee.position().add(delta))
if (teleportee is ServerPlayer) { for (player in playersToUpdate) {
teleportee.connection.resetPosition() player.connection.resetPosition()
IXplatAbstractions.INSTANCE.sendPacketToPlayer(teleportee, MsgBlinkAck(delta)) IXplatAbstractions.INSTANCE.sendPacketToPlayer(player, MsgBlinkAck(delta))
} }
} }
} }