Merge branch 'master' into vehicles-turrets

themeldingwars · Aug 24, 2024 · 49189ff · 49189ff
2 parents f0bda77 + 26bd5f8
commit 49189ff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Lib/AeroMessages b/Lib/AeroMessages
diff --git a/UdpHosts/GameServer/Entities/Character/CharacterEntity.cs b/UdpHosts/GameServer/Entities/Character/CharacterEntity.cs
@@ -64,17 +64,17 @@ public CharacterEntity(IShard shard, ulong eid)
         { PermissionFlagsData.CharacterPermissionFlags.movement, true },
         { PermissionFlagsData.CharacterPermissionFlags.sprint, true },
         { PermissionFlagsData.CharacterPermissionFlags.jump, true },
-        { PermissionFlagsData.CharacterPermissionFlags.unk_3, true },
+        { PermissionFlagsData.CharacterPermissionFlags.interact, true },
         { PermissionFlagsData.CharacterPermissionFlags.weapon, true },
-        { PermissionFlagsData.CharacterPermissionFlags.unk_5, true },
+        { PermissionFlagsData.CharacterPermissionFlags.melee, true },
         { PermissionFlagsData.CharacterPermissionFlags.abilities, true },
-        { PermissionFlagsData.CharacterPermissionFlags.unk_7, true },
+        { PermissionFlagsData.CharacterPermissionFlags.flashlight, true },
         { PermissionFlagsData.CharacterPermissionFlags.unk_8, false },
         { PermissionFlagsData.CharacterPermissionFlags.cheat_jump_midair, false },
         { PermissionFlagsData.CharacterPermissionFlags.glider, false },
         { PermissionFlagsData.CharacterPermissionFlags.unk_11, false },
         { PermissionFlagsData.CharacterPermissionFlags.jetpack, true },
-        { PermissionFlagsData.CharacterPermissionFlags.unk_13, true },
+        { PermissionFlagsData.CharacterPermissionFlags.map, true },
         { PermissionFlagsData.CharacterPermissionFlags.unk_14, true },
         { PermissionFlagsData.CharacterPermissionFlags.unk_15, true },
         { PermissionFlagsData.CharacterPermissionFlags.new_character, false },
@@ -85,7 +85,7 @@ public CharacterEntity(IShard shard, ulong eid)
         { PermissionFlagsData.CharacterPermissionFlags.unk_21, true },
         { PermissionFlagsData.CharacterPermissionFlags.calldown_abilities, true },
         { PermissionFlagsData.CharacterPermissionFlags.unk_23, true },
-        { PermissionFlagsData.CharacterPermissionFlags.unk_24, true },
+        { PermissionFlagsData.CharacterPermissionFlags.emotes, true },
         { PermissionFlagsData.CharacterPermissionFlags.unk_25, true },
         { PermissionFlagsData.CharacterPermissionFlags.unk_26, true },
         { PermissionFlagsData.CharacterPermissionFlags.self_revive, true },
+3 −3		AeroMessages/GSS/V66/Character/CharacterShared.cs
+5 −5		AeroMessages/GSS/V66/Character/Controller/CombatController.cs
+3 −3		AeroMessages/GSS/V66/Character/Event/FactionReputationUpdate.cs
+3 −1		AeroMessages/GSS/V66/Generic/Event/AchievementUnlocked.cs