Skip to content

Commit acb8bec

Browse files
louis1706louis1706
authored
Merge branch 'master' into dev
2 parents b7698cd + 1aa0aeb commit acb8bec

2 files changed

Lines changed: 70 additions & 93 deletions

File tree

‎.github/README.md‎

Lines changed: 62 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -26,91 +26,68 @@
2626
Localized READMEs
2727
</h1>
2828

29-
<div align="center">
30-
<div>
31-
<img src="https://flagsapi.com/US/flat/64.png" height=30>
32-
<br>
33-
<a href="documentation/README.md">English</a>
34-
</div>
35-
<br>
36-
<div>
37-
<img src="https://flagsapi.com/RU/flat/64.png" height=30>
38-
<br>
39-
<a href="documentation/localization/README-Русский.md">Русский</a>
40-
</div>
41-
<br>
42-
<div>
43-
<img src="https://flagsapi.com/CN/flat/64.png" height=30>
44-
<br>
45-
<a href="documentation/localization/README-中文.md">中文</a>
46-
</div>
47-
<br>
48-
<div>
49-
<img src="https://flagsapi.com/ES/flat/64.png" height=30>
50-
<br>
51-
<a href="documentation/localization/README-ES.md">Español</a>
52-
</div>
53-
<br>
54-
<div>
55-
<img src="https://flagsapi.com/PL/flat/64.png" height=30>
56-
<br>
57-
<a href="documentation/localization/README-PL.md">Polski</a>
58-
</div>
59-
<br>
60-
<div>
61-
<img src="https://flagsapi.com/BR/flat/64.png" height=30>
62-
<br>
63-
<a href="documentation/localization/README-BR.md">Português-BR</a>
64-
</div>
65-
<br>
66-
<div>
67-
<img src="https://flagsapi.com/IT/flat/64.png" height=30>
68-
<br>
69-
<a href="documentation/localization/README-IT.md">Italiano</a>
70-
</div>
71-
<br>
72-
<div>
73-
<img src="https://flagsapi.com/CZ/flat/64.png" height=30>
74-
<br>
75-
<a href="documentation/localization/README-CS.md">Čeština</a>
76-
</div>
77-
<br>
78-
<div>
79-
<img src="https://flagsapi.com/DK/flat/64.png" height=30>
80-
<br>
81-
<a href="documentation/localization/README-DK.md">Dansk</a>
82-
</div>
83-
<br>
84-
<div>
85-
<img src="https://flagsapi.com/TR/flat/64.png" height=30>
86-
<br>
87-
<a href="documentation/localization/README-TR.md">Türkçe</a>
88-
</div>
89-
<br>
90-
<div>
91-
<img src="https://flagsapi.com/DE/flat/64.png" height=30>
92-
<br>
93-
<a href="documentation/localization/README-DE.md">Deutsch</a>
94-
</div>
95-
<br>
96-
<div>
97-
<img src="https://flagsapi.com/FR/flat/64.png" height=30>
98-
<br>
99-
<a href="documentation/localization/README-FR.md">Français</a>
100-
</div>
101-
<br>
102-
<div>
103-
<img src="https://flagsapi.com/KR/flat/64.png" height=30>
104-
<br>
105-
<a href="documentation/localization/README-KR.md">한국어</a>
106-
</div>
107-
<br>
108-
<div>
109-
<img src="https://flagsapi.com/TH/flat/64.png" height=30>
110-
<br>
111-
<a href="documentation/localization/README-ไทย.md">ไทย</a>
112-
</div>
113-
</div>
29+
<table align="center">
30+
<tr>
31+
<td align="center">
32+
<img src="https://flagsapi.com/US/flat/64.png" height=30><br>
33+
<a href="documentation/README.md">English</a>
34+
</td>
35+
<td align="center">
36+
<img src="https://flagsapi.com/RU/flat/64.png" height=30><br>
37+
<a href="documentation/localization/README-Русский.md">Русский</a>
38+
</td>
39+
<td align="center">
40+
<img src="https://flagsapi.com/CN/flat/64.png" height=30><br>
41+
<a href="documentation/localization/README-中文.md">中文</a>
42+
</td>
43+
<td align="center">
44+
<img src="https://flagsapi.com/ES/flat/64.png" height=30><br>
45+
<a href="documentation/localization/README-ES.md">Español</a>
46+
</td>
47+
<td align="center">
48+
<img src="https://flagsapi.com/PL/flat/64.png" height=30><br>
49+
<a href="documentation/localization/README-PL.md">Polski</a>
50+
</td>
51+
<td align="center">
52+
<img src="https://flagsapi.com/BR/flat/64.png" height=30><br>
53+
<a href="documentation/localization/README-BR.md">Português-BR</a>
54+
</td>
55+
<td align="center">
56+
<img src="https://flagsapi.com/IT/flat/64.png" height=30><br>
57+
<a href="documentation/localization/README-IT.md">Italiano</a>
58+
</td>
59+
</tr>
60+
<tr>
61+
<td align="center">
62+
<img src="https://flagsapi.com/CZ/flat/64.png" height=30><br>
63+
<a href="documentation/localization/README-CS.md">Čeština</a>
64+
</td>
65+
<td align="center">
66+
<img src="https://flagsapi.com/DK/flat/64.png" height=30><br>
67+
<a href="documentation/localization/README-DK.md">Dansk</a>
68+
</td>
69+
<td align="center">
70+
<img src="https://flagsapi.com/TR/flat/64.png" height=30><br>
71+
<a href="documentation/localization/README-TR.md">Türkçe</a>
72+
</td>
73+
<td align="center">
74+
<img src="https://flagsapi.com/DE/flat/64.png" height=30><br>
75+
<a href="documentation/localization/README-DE.md">Deutsch</a>
76+
</td>
77+
<td align="center">
78+
<img src="https://flagsapi.com/FR/flat/64.png" height=30><br>
79+
<a href="documentation/localization/README-FR.md">Français</a>
80+
</td>
81+
<td align="center">
82+
<img src="https://flagsapi.com/KR/flat/64.png" height=30><br>
83+
<a href="documentation/localization/README-KR.md">한국어</a>
84+
</td>
85+
<td align="center">
86+
<img src="https://flagsapi.com/TH/flat/64.png" height=30><br>
87+
<a href="documentation/localization/README-ไทย.md">ไทย</a>
88+
</td>
89+
</tr>
90+
</table>
11491

11592
<h5 align="center">This repo is a fork of <a href="https://github.com/Exiled-Team/EXILED">Exiled-Team/EXILED</a> after changes in project leadership.</h5>
11693
<h6 align="center">You can access the commit this update was forked from <a href="https://github.com/Exiled-Team/EXILED/tree/8b03fe7d9d2fe7ebffd5e6d1d038fc3881cdeb70">here</a>.</h6>

‎EXILED/Exiled.Events/Patches/Events/Player/TriggeringTesla.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ private static void TriggeringTeslaEvent(BaseTeslaGate baseTeslaGate, ref bool i
7676
{
7777
TeslaGate teslaGate = TeslaGate.Get(baseTeslaGate);
7878

79-
foreach (Player player in ReferenceHub.AllHubs.Select(Player.Get))
79+
foreach (ReferenceHub hub in ReferenceHub.AllHubs)
8080
{
81-
if (player is null || !teslaGate.CanBeIdle(player))
81+
if (!Player.TryGet(hub, out Player player) || !teslaGate.CanBeIdle(player))
8282
continue;
8383

8484
TriggeringTeslaEventArgs ev = new(player, teslaGate);
@@ -97,31 +97,31 @@ private static void TriggeringTeslaEvent(BaseTeslaGate baseTeslaGate, ref bool i
9797

9898
if (ev.IsTriggerable && !isTriggerable && !teslaGate.IsShocking)
9999
{
100-
isTriggerable = ev.IsTriggerable;
101-
PlayerTriggeringTeslaEventArgs playerTriggeringTeslaEventArgs = new(player.ReferenceHub, teslaGate.Base);
100+
isTriggerable = true;
101+
PlayerTriggeringTeslaEventArgs playerTriggeringTeslaEventArgs = new(hub, teslaGate.Base);
102102
PlayerEvents.OnTriggeringTesla(playerTriggeringTeslaEventArgs);
103103
if (!playerTriggeringTeslaEventArgs.IsAllowed)
104104
{
105105
isTriggerable = false;
106106
}
107107
else
108108
{
109-
referenceHub2 = player.ReferenceHub;
109+
referenceHub2 = hub;
110110
}
111111
}
112112

113113
if (ev.IsInIdleRange && !inIdleRange)
114114
{
115-
inIdleRange = ev.IsInIdleRange;
116-
PlayerIdlingTeslaEventArgs playerIdlingTeslaEventArgs = new(player.ReferenceHub, teslaGate.Base);
115+
inIdleRange = true;
116+
PlayerIdlingTeslaEventArgs playerIdlingTeslaEventArgs = new(hub, teslaGate.Base);
117117
PlayerEvents.OnIdlingTesla(playerIdlingTeslaEventArgs);
118118
if (!playerIdlingTeslaEventArgs.IsAllowed)
119119
{
120120
inIdleRange = false;
121121
}
122122
else
123123
{
124-
referenceHub = player.ReferenceHub;
124+
referenceHub = hub;
125125
}
126126
}
127127
}

0 commit comments

Comments
 (0)