Skip to content

Commit f66ba09

Browse files
committed
Changed player.reset_player to player.reset_all_entity.
Minor fix.
1 parent 424e4bf commit f66ba09

File tree

4 files changed

+23
-42
lines changed

4 files changed

+23
-42
lines changed

addons/source-python/packages/source-python/entities/_base.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
# Source.Python Imports
6868
# Entities
6969
from _entities._entity import BaseEntity
70-
from _entities._transmit import TransmitManager
70+
from _entities._transmit import transmit_manager
7171

7272

7373
# =============================================================================
@@ -785,46 +785,46 @@ def set_parent(self, parent, attachment=INVALID_ATTACHMENT_INDEX):
785785
# =========================================================================
786786
def hide(self):
787787
"""Hide the entity from all players."""
788-
TransmitManager.hide(self.index)
788+
transmit_manager.hide(self.index)
789789

790790
def hide_from(self, player_index):
791791
"""Hide the entity from player.
792792
793793
:param int player_index:
794794
The target player index to hide this entity.
795795
"""
796-
TransmitManager.hide_from(self.index, player_index)
796+
transmit_manager.hide_from(self.index, player_index)
797797

798798
def show(self):
799799
"""Show the entity to all players."""
800-
TransmitManager.show(self.index)
800+
transmit_manager.show(self.index)
801801

802802
def show_from(self, player_index):
803803
"""Show the entity to player.
804804
805805
:param int player_index:
806806
The target player index to show this entity.
807807
"""
808-
TransmitManager.show_from(self.index, player_index)
808+
transmit_manager.show_from(self.index, player_index)
809809

810810
def reset(self):
811811
"""Reset the entity's hidden/shown state."""
812-
TransmitManager.reset(self.index)
812+
transmit_manager.reset(self.index)
813813

814814
def reset_from(self, player_index):
815815
"""Reset the player's entity hidden/shown state.
816816
817817
:param int player_index:
818818
The target player index to reset the player's hidden/shown state.
819819
"""
820-
TransmitManager.reset_from(self.index, player_index)
820+
transmit_manager.reset_from(self.index, player_index)
821821

822822
def is_hidden(self):
823823
"""Return True if the entity is hidden from any player.
824824
825825
:rtype: bool
826826
"""
827-
return TransmitManager.is_hidden(self.index)
827+
return transmit_manager.is_hidden(self.index)
828828

829829
def is_hidden_from(self, player_index):
830830
"""Return True if the entity is hidden from the player.
@@ -833,7 +833,7 @@ def is_hidden_from(self, player_index):
833833
The target player index to check if the entity is hidden.
834834
:rtype: bool
835835
"""
836-
return TransmitManager.is_hidden_from(self.index, player_index)
836+
return transmit_manager.is_hidden_from(self.index, player_index)
837837

838838
def get_hidden_player(self):
839839
"""Get the players where the entity is hidden.
@@ -843,7 +843,7 @@ def get_hidden_player(self):
843843
in which the entity is hidden.
844844
:rtype: tuple
845845
"""
846-
return TransmitManager.get_hidden_player(self.index)
846+
return transmit_manager.get_hidden_player(self.index)
847847

848848

849849
# =============================================================================
@@ -882,4 +882,4 @@ def _on_entity_deleted(base_entity):
882882
cls.cache.pop(index, None)
883883

884884
# Reset the entity's hidden state.
885-
TransmitManager.reset(index)
885+
transmit_manager.reset(index)

addons/source-python/packages/source-python/entities/transmit.py

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,47 +2,28 @@
22

33
"""Provides entity transmission filtering."""
44

5-
# ============================================================================
6-
# >> IMPORTS
7-
# ============================================================================
8-
# Source.Python
9-
# Core
10-
from core import AutoUnload
11-
# Entities
12-
from entities.entity import Entity
13-
from entities.hooks import EntityCondition
14-
# Filters
15-
from filters.entities import EntityIter
16-
# Listeners
17-
from listeners import on_entity_created_listener_manager
18-
195

206
# ============================================================================
217
# >> FORWARD IMPORTS
228
# ============================================================================
239
# Source.Python
2410
# Entities
25-
from _entities._transmit import TransmitManager
11+
from _entities._transmit import transmit_manager
2612

2713

2814
# ============================================================================
2915
# >> ALL DECLARATION
3016
# ============================================================================
3117
__all__ = (
32-
'TransmitManager',
18+
'transmit_manager',
3319
'reset_hidden_state',
3420
)
3521

3622

37-
# ============================================================================
38-
# >> CLASSES
39-
# ============================================================================
40-
41-
4223
# =============================================================================
4324
# >> FUNCTIONS
4425
# =============================================================================
4526
def reset_hidden_state():
4627
"""Reset all entities' hidden/shown state."""
47-
TransmitManager.reset_all()
28+
transmit_manager.reset_all()
4829

addons/source-python/packages/source-python/players/_base.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
# =============================================================================
7979
# Source.Python Imports
8080
# Entities
81-
from _entities._transmit import TransmitManager
81+
from _entities._transmit import transmit_manager
8282

8383

8484
# =============================================================================
@@ -1011,27 +1011,27 @@ def hide_entity(self, entity_index):
10111011
:param int entity_index:
10121012
The target entity index to hide from the player.
10131013
"""
1014-
TransmitManager.hide_from(entity_index, self.index)
1014+
transmit_manager.hide_from(entity_index, self.index)
10151015

10161016
def show_entity(self, entity_index):
10171017
"""Show the entity to player.
10181018
10191019
:param int entity_index:
10201020
The target entity index to show the entity to player.
10211021
"""
1022-
TransmitManager.show_from(entity_index, self.index)
1022+
transmit_manager.show_from(entity_index, self.index)
10231023

10241024
def reset_entity(self, entity_index):
10251025
"""Reset the player's entity hidden/shown state.
10261026
10271027
:param int entity_index:
10281028
The target entity_index to reset the player's hidden/shown state.
10291029
"""
1030-
TransmitManager.reset_from(entity_index, self.index)
1030+
transmit_manager.reset_from(entity_index, self.index)
10311031

1032-
def reset_player(self):
1032+
def reset_all_entity(self):
10331033
"""Reset the player's hidden/shown state on all entities."""
1034-
TransmitManager.reset_player(self.index)
1034+
transmit_manager.reset_player(self.index)
10351035

10361036
def is_entity_hidden(self, entity_index):
10371037
"""Return True if the entity is hidden from the player.
@@ -1040,7 +1040,7 @@ def is_entity_hidden(self, entity_index):
10401040
The target entity index to check if the entity is hidden.
10411041
:rtype: bool
10421042
"""
1043-
return TransmitManager.is_hidden_from(entity_index, self.index)
1043+
return transmit_manager.is_hidden_from(entity_index, self.index)
10441044

10451045
def get_hidden_entity(self):
10461046
"""Get the entities that are hidden from the player.
@@ -1050,7 +1050,7 @@ def get_hidden_entity(self):
10501050
that are hidden from the player.
10511051
:rtype: tuple
10521052
"""
1053-
return TransmitManager.get_hidden_entity(self.index)
1053+
return transmit_manager.get_hidden_entity(self.index)
10541054

10551055

10561056
# =============================================================================

src/core/modules/entities/entities_transmit_wrap.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,6 @@ void export_transmit_manager(scope _transmit)
137137
;
138138

139139
// Singleton...
140-
_transmit.attr("TransmitManager") = object(ptr(CTransmitManager::get_instance()));
140+
_transmit.attr("transmit_manager") = object(ptr(CTransmitManager::get_instance()));
141141
}
142142

0 commit comments

Comments
 (0)