summaryrefslogtreecommitdiffstats
path: root/modules/mono/csharp_script.cpp
diff options
context:
space:
mode:
authordarth negative hunter <73083466+thenegativehunter2@users.noreply.github.com>2021-08-30 13:04:14 +0430
committerGitHub <noreply@github.com>2021-08-30 13:04:14 +0430
commit24066b3c7ac9277348ccc2aabb7235cde1db88bd (patch)
tree66c5ae11bd21d9bf15e505399aa53e8de1d2dfa7 /modules/mono/csharp_script.cpp
parent3afabb8f17c1b031a28ce87d40024078a6ee69b2 (diff)
parent61d681cfb9a89f5c32a6c85e8f1cf53360c6eddb (diff)
downloadredot-engine-24066b3c7ac9277348ccc2aabb7235cde1db88bd.tar.gz
Merge branch 'godotengine:master' into master_texture_array_normal_added
Diffstat (limited to 'modules/mono/csharp_script.cpp')
-rw-r--r--modules/mono/csharp_script.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp
index 1f7f1390ea..978093b7d5 100644
--- a/modules/mono/csharp_script.cpp
+++ b/modules/mono/csharp_script.cpp
@@ -3466,13 +3466,10 @@ int CSharpScript::get_member_line(const StringName &p_member) const {
MultiplayerAPI::RPCMode CSharpScript::_member_get_rpc_mode(IMonoClassMember *p_member) const {
if (p_member->has_attribute(CACHED_CLASS(RemoteAttribute))) {
- return MultiplayerAPI::RPC_MODE_REMOTE;
- }
- if (p_member->has_attribute(CACHED_CLASS(MasterAttribute))) {
- return MultiplayerAPI::RPC_MODE_MASTER;
+ return MultiplayerAPI::RPC_MODE_ANY;
}
if (p_member->has_attribute(CACHED_CLASS(PuppetAttribute))) {
- return MultiplayerAPI::RPC_MODE_PUPPET;
+ return MultiplayerAPI::RPC_MODE_AUTHORITY;
}
return MultiplayerAPI::RPC_MODE_DISABLED;