mirror of
https://github.com/MSWS/TTT.git
synced 2025-12-06 14:33:52 -08:00
Compare commits
10 Commits
2.0.0
...
2.0.3-dev.
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ba91bfb1cf | ||
|
|
6da8a729ab | ||
|
|
d9f49473eb | ||
|
|
c2ada273a8 | ||
|
|
deb2e1cab2 | ||
|
|
dfe86b0242 | ||
|
|
eff68897a0 | ||
|
|
63afe31e3b | ||
|
|
a7fa2afe15 | ||
|
|
7749deabd3 |
4
.github/workflows/dotnet.yml
vendored
4
.github/workflows/dotnet.yml
vendored
@@ -13,7 +13,7 @@ jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v6
|
||||
with:
|
||||
fetch-depth: 0
|
||||
fetch-tags: true
|
||||
@@ -51,7 +51,7 @@ jobs:
|
||||
contents: read
|
||||
pull-requests: write
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v6
|
||||
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v5
|
||||
|
||||
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
@@ -18,7 +18,7 @@ jobs:
|
||||
MAX_CHANGELOG_CHARS: "50000"
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v6
|
||||
with:
|
||||
fetch-depth: 0
|
||||
fetch-tags: true
|
||||
|
||||
@@ -82,7 +82,7 @@ public class SpeedRound(IServiceProvider provider)
|
||||
public void OnDeath(PlayerDeathEvent ev) {
|
||||
var game = games.ActiveGame;
|
||||
if (game == null) return;
|
||||
if (Tracker.ActiveRounds.Contains(this)) return;
|
||||
if (!Tracker.ActiveRounds.Contains(this)) return;
|
||||
|
||||
var victimRoles = roles.GetRoles(ev.Victim);
|
||||
if (!victimRoles.Any(r => r is InnocentRole)) return;
|
||||
|
||||
@@ -42,7 +42,7 @@ public class VanillaRound(IServiceProvider provider)
|
||||
[UsedImplicitly]
|
||||
[EventHandler(Priority = Priority.HIGH)]
|
||||
public void OnPurchase(PlayerPurchaseItemEvent ev) {
|
||||
if (Tracker.ActiveRounds.Contains(this)) return;
|
||||
if (!Tracker.ActiveRounds.Contains(this)) return;
|
||||
ev.IsCanceled = true;
|
||||
|
||||
messenger.Message(ev.Player, locale[RoundMsgs.VANILLA_ROUND_REMINDER]);
|
||||
|
||||
@@ -86,8 +86,7 @@ public class SpecialRoundStarter(IServiceProvider provider)
|
||||
var rounds = Provider.GetServices<ITerrorModule>()
|
||||
.OfType<AbstractSpecialRound>()
|
||||
.Where(r => r.Config.Weight > 0 && !exclude.Contains(r))
|
||||
.Where(r
|
||||
=> !exclude.Any(er => er.ConflictsWith(r) && !r.ConflictsWith(er)))
|
||||
.Where(r => !exclude.Any(er => er.ConflictsWith(r) || r.ConflictsWith(er)))
|
||||
.ToList();
|
||||
if (rounds.Count == 0) return null;
|
||||
var totalWeight = rounds.Sum(r => r.Config.Weight);
|
||||
|
||||
Reference in New Issue
Block a user