Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream sync #2348

Merged
merged 7 commits into from
Jun 27, 2024
Merged

Upstream sync #2348

merged 7 commits into from
Jun 27, 2024

Conversation

Morb0
Copy link
Member

@Morb0 Morb0 commented Jun 27, 2024

Описание PR

Медиа

Проверки

  • PR полностью завершён и мне не нужна помощь чтобы его закончить.
  • Я внимательно просмотрел все свои изменения и багов в них не нашёл.
  • Я запускал локальный сервер со своими изменениями и всё протестировал.
  • Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

Изменения

PJB3005 and others added 7 commits June 27, 2024 16:57
This feature should never have been merged, it can be trivially abused to break the entire server.

It's behind a CVar because honestly that's the easiest way to 1984 the feature.
Apparently we did not have these.
The F3 coords manager is blocked if you're not an admin. This check happened even when playing a replay, where you actually aren't. There's now a check to make sure you are actually server-connected-to-game before running the logic.

Also moved it to a manager because this *shouldn't be a bloody entity system in the first place*.
* CookBook name,id and description changed

* Id isues with CookBook fixed

* Maps not added
…er-syndie

# Conflicts:
#	Content.Client/Entry/EntryPoint.cs
#	Content.Client/IoC/ClientContentIoC.cs
@Morb0 Morb0 merged commit 13620a0 into master Jun 27, 2024
12 checks passed
@Morb0 Morb0 deleted the upstream-sync branch June 28, 2024 11:31
lzk228 pushed a commit that referenced this pull request Jun 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants