Skip to content

Sync upstream fixes, spawn management, and small PR integrations - #1

Merged
cursor[bot] merged 9 commits into
mainfrom
cursor/upstream-fixes-and-spawn-mgmt-22ea
Jun 15, 2026
Merged

Sync upstream fixes, spawn management, and small PR integrations#1
cursor[bot] merged 9 commits into
mainfrom
cursor/upstream-fixes-and-spawn-mgmt-22ea

Conversation

@zPoche

@zPoche zPoche commented Jun 15, 2026

Copy link
Copy Markdown
Owner

Summary

Brings NeoServer up to date with upstream DarkflameUniverse/DarkflameServer and integrates selected small fixes and tooling PRs.

Upstream sync

Cherry-picked / integrated fixes

Docs

  • Updated docs/Commands.md with spawn management commands

Status

Merged into main.

Test plan

  • Build server successfully
  • Verify /spawn with optional coordinates and group name
  • Verify spawn management commands (/list-group, /despawn-group, etc.)
  • Verify vendor sell → buyback maintains max 27 items
  • Verify FV dragon fire breath deals damage
  • Hit GF banana trees — banana should drop and damage attacker
  • Optional: set angry_apes=1 in config and test rare gorilla spawn
Open in Web Open in Cursor 

EmosewaMC and others added 9 commits June 14, 2026 20:54
* change network settings from vector to LwoNameValue

* move settings on Entity to managed memory

* Migrate more members

* chore: remove pointer leakage from raw ldf pointers

* feedback

* fix ci
tested that the mech build, the fv rock build, and the frakjaw builds (to get to the instancer) all function as intented
tested that the fire breath attack works now (hack fix)
Cherry-pick and manual integration of upstream PRs:
- DarkflameUniverse#1807 spawn management GM commands (list/despawn/save by group, spawner, player)
- DarkflameUniverse#1607 vendor buyback inventory live accuracy (27-item queue)
- Enhanced /spawn with position, rotation, and group support
- Added GetEntitiesBySpawnerID to EntityManager

Previously cherry-picked on this branch:
- upstream main (DarkflameUniverse#1995, DarkflameUniverse#1996)
- DarkflameUniverse#1876 root.xml vanity fix
- DarkflameUniverse#1739 default client_location
- DarkflameUniverse#1997 dragon fire trails fix
- DarkflameUniverse#1946 docker documentation improvements

Co-authored-by: zPoche <zPoche@users.noreply.github.com>
- DarkflameUniverse#1913 Banana trees drop bananas on hit instead of spawning gorillas
  Optional angry ape easter egg via angry_apes=1 in config
- DarkflameUniverse#1867 Update .github/copilot-instructions.md for AI-assisted development

Co-authored-by: zPoche <zPoche@users.noreply.github.com>
@zPoche
zPoche marked this pull request as ready for review June 15, 2026 13:25
@cursor
cursor Bot merged commit f5c5757 into main Jun 15, 2026
0 of 7 checks passed
@cursor
cursor Bot deleted the cursor/upstream-fixes-and-spawn-mgmt-22ea branch July 3, 2026 16:41
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