mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-27 13:06:02 +01:00
16ab69f11b
Right now this only affects the recently added PlayerMicroMoveEvent. I figured this should be done to keep the events organized in the same way Bukkit and Spigot do. This should lead to a less cluttered event package when we do add more events.
40 lines
2.3 KiB
Diff
40 lines
2.3 KiB
Diff
From c43de820b2e0a4656f0286bbad15c20296c594a2 Mon Sep 17 00:00:00 2001
|
|
From: Techcable <Techcable@outlook.com>
|
|
Date: Thu, 23 Jul 2015 04:29:22 -0700
|
|
Subject: [PATCH] Add PlayerMicroMoveEvent
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
index 8c87c31..4902635 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
@@ -62,6 +62,7 @@ import org.bukkit.util.NumberConversions;
|
|
// CraftBukkit end
|
|
|
|
import org.github.paperspigot.PaperSpigotConfig; // PaperSpigot
|
|
+import org.github.paperspigot.event.player.PlayerMicroMoveEvent; // PaperSpigot
|
|
|
|
public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerListBox {
|
|
|
|
@@ -257,7 +258,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
|
double delta = Math.pow(this.lastPosX - to.getX(), 2) + Math.pow(this.lastPosY - to.getY(), 2) + Math.pow(this.lastPosZ - to.getZ(), 2);
|
|
float deltaAngle = Math.abs(this.lastYaw - to.getYaw()) + Math.abs(this.lastPitch - to.getPitch());
|
|
|
|
- if ((delta > 1f / 256 || deltaAngle > 10f) && (this.checkMovement && !this.player.dead)) {
|
|
+ if ((delta > 0 || deltaAngle > 0) && (this.checkMovement && !this.player.dead)) { // PaperSpigot
|
|
this.lastPosX = to.getX();
|
|
this.lastPosY = to.getY();
|
|
this.lastPosZ = to.getZ();
|
|
@@ -267,7 +268,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
|
// Skip the first time we do this
|
|
if (true) { // Spigot - don't skip any move events
|
|
Location oldTo = to.clone();
|
|
- PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
|
|
+ PlayerMoveEvent event = (delta > 1f / 256 || deltaAngle > 10f) ? new PlayerMoveEvent(player, from, to) : new PlayerMicroMoveEvent(player, from, to); // PaperSpigot - PlayerMicroMoveEvent
|
|
this.server.getPluginManager().callEvent(event);
|
|
|
|
// If the event is cancelled we move the player back to their old location.
|
|
--
|
|
1.9.5.msysgit.1
|
|
|