diff --git a/MCGalaxy/Commands/Chat/CmdSend.cs b/MCGalaxy/Commands/Chat/CmdSend.cs
index 6879127a1..fbf7b63ca 100644
--- a/MCGalaxy/Commands/Chat/CmdSend.cs
+++ b/MCGalaxy/Commands/Chat/CmdSend.cs
@@ -55,9 +55,9 @@ namespace MCGalaxy.Commands {
if (receiver == null) return;
if (Player.IsSuper(p)) {
- receiver.SendMessage("Message recieved from " + senderNick + "%S.");
- } else {
- p.MessageTo(receiver, "Message recieved from " + senderNick + "%S.");
+ Player.Message(receiver, "Message recieved from " + senderNick + "%S.");
+ } else if (Chat.NotIgnoring(p, receiver)) {
+ Player.Message(receiver, "Message recieved from " + senderNick + "%S.");
}
}
diff --git a/MCGalaxy/Commands/other/CmdTpA.cs b/MCGalaxy/Commands/other/CmdTpA.cs
index 3858380f1..3ce804291 100644
--- a/MCGalaxy/Commands/other/CmdTpA.cs
+++ b/MCGalaxy/Commands/other/CmdTpA.cs
@@ -63,9 +63,11 @@ namespace MCGalaxy.Commands {
}
static void ShowRequestMessage(Player p, Player target) {
- p.MessageTo(target, p.ColoredName + " %Swould like to teleport to you.");
- p.MessageTo(target, "Type &2/tpaccept %Sor &4/tpdeny%S.");
- p.MessageTo(target, "This request will timeout after &b90 %Sseconds.");
+ if (!Chat.NotIgnoring(p, target)) return;
+
+ Player.Message(target, p.ColoredName + " %Swould like to teleport to you.");
+ Player.Message(target, "Type &2/tpaccept %Sor &4/tpdeny%S.");
+ Player.Message(target, "This request will timeout after &b90 %Sseconds.");
}
void DoAccept(Player p) {
diff --git a/MCGalaxy/Network/Player.Networking.cs b/MCGalaxy/Network/Player.Networking.cs
index f8ad08b4a..c18ee821c 100644
--- a/MCGalaxy/Network/Player.Networking.cs
+++ b/MCGalaxy/Network/Player.Networking.cs
@@ -151,17 +151,6 @@ namespace MCGalaxy {
}
}
- /// Sends a message to the target player, unless the
- /// target player is ignoring this player.
- /// Whether the target player is ignoring this player.
- public bool MessageTo(Player other, string message) {
- if (other.ignoreAll || other.listignored.CaselessContains(name)) return false;
- other.SendMessage(message);
- return true;
- }
-
- public void SendBlankMessage() { Send(Packet.BlankMessage()); }
-
public static void MessageLines(Player p, IEnumerable lines) {
foreach (string line in lines)
SendMessage(p, line, true);
@@ -348,7 +337,7 @@ namespace MCGalaxy {
/// Sends a packet indicating an absolute position + orientation change for an enity.
public void SendPos(byte id, Position pos, Orientation rot) {
if (id == Entities.SelfID) {
- Pos = pos; Rot = rot;
+ Pos = pos; SetYawPitch(rot.RotY, rot.HeadX);
pos.Y -= 22; // NOTE: Fix for standard clients
}
Send(Packet.Teleport(id, pos, rot));