tyler.durden
/
P3D-Legacy
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix registered trainers still do in sight check" 

This reverts commit b7a045e37c.
This commit is contained in:
JappaWakka 2023-08-10 19:45:14 +02:00
parent b7a045e37c
commit 464c317d2f
1 changed files with 48 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
P3D/Entites/Other/NPC.vb
View File

@ -352,7 +352,7 @@
If distance <= Me.TrainerSight Then
Dim InSightMusic As String = "nomusic"
Dim t As Trainer = Nothing
If Me.IsTrainer = True Then
Dim trainerFilePath As String = GameModeManager.GetScriptPath(Me.AdditionalValue & ".dat")
Security.FileValidation.CheckFileValid(trainerFilePath, False, "NPC.vb")
@ -365,7 +365,7 @@
If Trainer.IsBeaten(trainerID) = True Then
Exit Sub
Else
t = New Trainer(trainerID)
Dim t As New Trainer(trainerID)
InSightMusic = t.GetInSightMusic()
End If
ElseIf l.StartsWith("@battle.starttrainer(") = True Then
@ -373,13 +373,13 @@
If Trainer.IsBeaten(trainerID) = True Then
Exit Sub
Else
t = New Trainer(trainerID)
Dim t As New Trainer(trainerID)
InSightMusic = t.GetInSightMusic()
End If
End If
Next
End If
If t IsNot Nothing Then
Dim needFacing As Integer = 0
Select Case Me.faceRotation
Case 0
@ -446,7 +446,6 @@
End If
End If
End If
End If
End Sub
Public Overrides Sub ClickFunction()