diff options
Diffstat (limited to 'server/src')
| -rw-r--r-- | server/src/commands.rs | 8 | ||||
| -rw-r--r-- | server/src/server.rs | 3 | ||||
| -rw-r--r-- | server/src/state.rs | 1 |
3 files changed, 5 insertions, 7 deletions
diff --git a/server/src/commands.rs b/server/src/commands.rs index d6ca8b25..b06d9261 100644 --- a/server/src/commands.rs +++ b/server/src/commands.rs @@ -171,13 +171,7 @@ impl Server { ) } Command::Effect { name } => { - self.tx - .send(PacketC::Communicate { - player, - message: Some(Message::Effect(name)), - timeout: None, - }) - .ok(); + self.tx.send(PacketC::Effect { name, player }).ok(); } Command::Item { name } => { let item = self diff --git a/server/src/server.rs b/server/src/server.rs index 2259d159..848e2bb4 100644 --- a/server/src/server.rs +++ b/server/src/server.rs @@ -381,6 +381,9 @@ impl Server { self.packet_out .push_back(PacketC::RemovePlayer { id: player }) } + PacketS::Effect { player, name } => { + self.packet_out.push_back(PacketC::Effect { name, player }); + } PacketS::Movement { pos, boost, diff --git a/server/src/state.rs b/server/src/state.rs index b9a43f6b..09e7031e 100644 --- a/server/src/state.rs +++ b/server/src/state.rs @@ -110,6 +110,7 @@ fn get_packet_player(packet: &PacketS) -> Option<PlayerID> { PacketS::Interact { player, .. } => Some(*player), PacketS::Communicate { player, .. } => Some(*player), PacketS::ReplaceHand { player, .. } => Some(*player), + PacketS::Effect { player, .. } => Some(*player), PacketS::ApplyScore(_) => None, PacketS::ReplayTick { .. } => None, } |