Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-09-28 22:47:41 +02:00
Code Issues Projects Releases Wiki Activity

Fix teleports

Browse Source
This commit is contained in:
Eoghanmc22 2020-09-26 16:03:51 -04:00
parent c3b1e88b83
commit ae44fa124d
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/minestom/server/entity/Player.java
View File

@ -1604,8 +1604,11 @@ public class Player extends LivingEntity implements CommandSender {
*/
protected void updatePlayerPosition() {
PlayerPositionAndLookPacket positionAndLookPacket = new PlayerPositionAndLookPacket();
positionAndLookPacket.position = position;
positionAndLookPacket.position = position.clone();
positionAndLookPacket.flags = 0x00;
if (teleportId == Integer.MAX_VALUE) {
teleportId = 0;
}
positionAndLookPacket.teleportId = teleportId++;
playerConnection.sendPacket(positionAndLookPacket);
}

10
src/main/java/net/minestom/server/listener/PlayerDiggingListener.java
View File

@ -13,7 +13,6 @@ import net.minestom.server.item.StackingRule;
import net.minestom.server.network.packet.client.play.ClientPlayerDiggingPacket;
import net.minestom.server.network.packet.server.play.AcknowledgePlayerDiggingPacket;
import net.minestom.server.network.packet.server.play.EntityEffectPacket;
import net.minestom.server.network.packet.server.play.PlayerPositionAndLookPacket;
import net.minestom.server.potion.PotionType;
import net.minestom.server.utils.BlockPosition;
@ -140,13 +139,8 @@ public class PlayerDiggingListener {
final BlockPosition playerBlockPosition = player.getPosition().toBlockPosition();
// Teleport the player back if he broke a solid block just below him
if (playerBlockPosition.subtract(0, 1, 0).equals(blockPosition)) {
PlayerPositionAndLookPacket positionAndLookPacket = new PlayerPositionAndLookPacket();
positionAndLookPacket.position = player.getPosition().clone().add(0, 0.25f, 0);
positionAndLookPacket.flags = 0x00;
positionAndLookPacket.teleportId = 999;
player.getPlayerConnection().sendPacket(positionAndLookPacket);
}
if (playerBlockPosition.subtract(0, 1, 0).equals(blockPosition))
player.teleport(player.getPosition());
}
}
}