fix some admin abuse stuff and clippy errors

Author: catornot

bp_ort/src/admin_abuse/health.rs

@@ -3,6 +3,7 @@ use rrplug::bindings::{
     cvar::convar::{FCVAR_CLIENTDLL, FCVAR_GAMEDLL, FCVAR_GAMEDLL_FOR_REMOTE_CLIENTS},
 };
 use rrplug::prelude::*;
+use shared::utils::is_alive;
 
 use crate::{
     admin_abuse::{
@@ -67,6 +68,10 @@ fn health_server_command(command: CCommandResult) {
 }
 
 fn set_health(player: &mut CPlayer, mut health: i32) {
+    if !is_alive(player) {
+        return;
+    }
+
     if health >= 524286 {
         health = 524286;
     }

bp_ort/src/admin_abuse/teleport.rs

@@ -1,5 +1,6 @@
 #![allow(unused)]
 
+use rrplug::bindings::class_types::cplayer::CPlayer;
 use rrplug::prelude::*;
 use rrplug::{
     bindings::{
@@ -8,7 +9,7 @@ use rrplug::{
     },
     mid::utils::from_char_ptr,
 };
-use shared::utils::lookup_ent;
+use shared::utils::{is_alive, lookup_ent, nudge_type};
 
 use crate::admin_abuse::completion_append_player_names;
 use crate::bindings::CLIENT_FUNCTIONS;
@@ -44,6 +45,14 @@ pub fn register_teleport_command(engine_data: &EngineData, token: EngineToken) {
         FCVAR_CLIENTDLL as i32,
         token,
     );
+
+    _ = engine_data.register_concommand(
+        "angles",
+        print_player_angles,
+        "",
+        FCVAR_CLIENTDLL as i32,
+        token,
+    );
 }
 
 #[rrplug::concommand]
@@ -57,6 +66,13 @@ fn print_player_position() -> Option<()> {
     None
 }
 
+#[rrplug::concommand]
+fn print_player_angles() -> Option<()> {
+    log::info!("angles: catornot should find the function in c_player lol");
+
+    None
+}
+
 #[rrplug::concommand]
 fn teleport_server_command(command: CCommandResult) -> Option<()> {
     if command.get_arg(1).is_none() {
@@ -84,9 +100,12 @@ fn teleport_server_command(command: CCommandResult) -> Option<()> {
             ))
         })
         .find_map(|(player, name)| {
+            unsafe {
+                (funcs.calc_origin)(player, &nudge_type::<*const CPlayer>(player), 0, 0);
+            }
             name_target
                 .starts_with(name.as_str())
-                .then_some(unsafe { *player.get_origin(&mut v) })
+                .then_some(player.m_vecAbsOrigin)
         })?;
 
     // if unsafe { !(funcs.check_position)(&tp_location).is_null() } {
@@ -97,7 +116,7 @@ fn teleport_server_command(command: CCommandResult) -> Option<()> {
     execute_for_matches(
         command.get_arg(0),
         |player| {
-            if lookup_ent(player.m_hMoveParent, funcs).is_none() {
+            if lookup_ent(player.m_hMoveParent, funcs).is_none() && is_alive(player) {
                 unsafe { (funcs.set_origin)(player, &tp_location) }
             }
         },

octbots/src/behavior.rs

@@ -1,4 +1,3 @@
-use bevy_math::prelude::*;
 use bonsai_bt::{
     Action,
     Behavior::{AlwaysSucceed, If, Select, WhenAny},

octbots/src/targeting.rs

@@ -16,7 +16,7 @@ use shared::{
 use std::{
     collections::BTreeMap,
     f32::consts::{PI, TAU},
-    hash::{DefaultHasher, Hash, Hasher},
+    hash::{Hash, Hasher},
 };
 
 use crate::behavior::BotAction;