bonkmaykr/ojrc
1
0
Fork 0
mirror of https://git.ngram.ca/OpenJam/rc-servers synced 2026-08-23 23:08:52 +00:00
Code Activity

Always skip sending to aliased connections (client AIs) #48

Browse Source
This commit is contained in:
NG (Graham)
2025-11-16 14:46:41 -05:00
parent 8d5f835497
commit dfc0cc351b
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rc_multiplayer/src/matches/generic.rs
View File

@@ -283,6 +283,7 @@ impl <L: super::CustomGameLogic> GenericGamemodeEngine<L> {
pub(super) async fn rebroadcast<T: byteserde::ser_heap::ByteSerializeHeap + ?Sized>(&self, user_id: i32, code: rlnl::event_code::NetworkEvent, property: literustlib::packet::Property, data: &T, in_game: bool) { pub(super) async fn rebroadcast<T: byteserde::ser_heap::ByteSerializeHeap + ?Sized>(&self, user_id: i32, code: rlnl::event_code::NetworkEvent, property: literustlib::packet::Property, data: &T, in_game: bool) {
for (player_id, conn) in self.users.read().await.iter() { for (player_id, conn) in self.users.read().await.iter() {
if user_id == conn.user.user_id() { continue; } if user_id == conn.user.user_id() { continue; }
if conn.aliases.contains(player_id) { continue; }
if in_game { if in_game {
let mode = ConnectionMode::from_u8(self.user_descriptor(*player_id).unwrap().state.mode.load(std::sync::atomic::Ordering::Relaxed)); let mode = ConnectionMode::from_u8(self.user_descriptor(*player_id).unwrap().state.mode.load(std::sync::atomic::Ordering::Relaxed));
if !matches!(mode, ConnectionMode::InGame) { continue; } if !matches!(mode, ConnectionMode::InGame) { continue; }
@@ -300,6 +301,7 @@ impl <L: super::CustomGameLogic> GenericGamemodeEngine<L> {
pub(super) async fn rebroadcast_dataless(&self, user_id: i32, code: rlnl::event_code::NetworkEvent, property: literustlib::packet::Property, in_game: bool) { pub(super) async fn rebroadcast_dataless(&self, user_id: i32, code: rlnl::event_code::NetworkEvent, property: literustlib::packet::Property, in_game: bool) {
for (player_id, conn) in self.users.read().await.iter() { for (player_id, conn) in self.users.read().await.iter() {
if user_id == conn.user.user_id() { continue; } if user_id == conn.user.user_id() { continue; }
if conn.aliases.contains(player_id) { continue; }
if in_game { if in_game {
let mode = ConnectionMode::from_u8(self.user_descriptor(*player_id).unwrap().state.mode.load(std::sync::atomic::Ordering::Relaxed)); let mode = ConnectionMode::from_u8(self.user_descriptor(*player_id).unwrap().state.mode.load(std::sync::atomic::Ordering::Relaxed));
if !matches!(mode, ConnectionMode::InGame) { continue; } if !matches!(mode, ConnectionMode::InGame) { continue; }
@@ -315,6 +317,7 @@ impl <L: super::CustomGameLogic> GenericGamemodeEngine<L> {
pub(super) async fn broadcast<T: byteserde::ser_heap::ByteSerializeHeap + ?Sized>(&self, code: rlnl::event_code::NetworkEvent, property: literustlib::packet::Property, data: &T, in_game: bool) { pub(super) async fn broadcast<T: byteserde::ser_heap::ByteSerializeHeap + ?Sized>(&self, code: rlnl::event_code::NetworkEvent, property: literustlib::packet::Property, data: &T, in_game: bool) {
for (player_id, conn) in self.users.read().await.iter() { for (player_id, conn) in self.users.read().await.iter() {
if conn.aliases.contains(player_id) { continue; }
if in_game { if in_game {
let mode = ConnectionMode::from_u8(self.user_descriptor(*player_id).unwrap().state.mode.load(std::sync::atomic::Ordering::Relaxed)); let mode = ConnectionMode::from_u8(self.user_descriptor(*player_id).unwrap().state.mode.load(std::sync::atomic::Ordering::Relaxed));
if !matches!(mode, ConnectionMode::InGame) { continue; } if !matches!(mode, ConnectionMode::InGame) { continue; }
@@ -331,6 +334,7 @@ impl <L: super::CustomGameLogic> GenericGamemodeEngine<L> {
pub(super) async fn broadcast_dataless(&self, code: rlnl::event_code::NetworkEvent, property: literustlib::packet::Property, in_game: bool) { pub(super) async fn broadcast_dataless(&self, code: rlnl::event_code::NetworkEvent, property: literustlib::packet::Property, in_game: bool) {
for (player_id, conn) in self.users.read().await.iter() { for (player_id, conn) in self.users.read().await.iter() {
if conn.aliases.contains(player_id) { continue; }
if in_game { if in_game {
let mode = ConnectionMode::from_u8(self.user_descriptor(*player_id).unwrap().state.mode.load(std::sync::atomic::Ordering::Relaxed)); let mode = ConnectionMode::from_u8(self.user_descriptor(*player_id).unwrap().state.mode.load(std::sync::atomic::Ordering::Relaxed));
if !matches!(mode, ConnectionMode::InGame) { continue; } if !matches!(mode, ConnectionMode::InGame) { continue; }