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

Siege rework #1

Merged
merged 21 commits into from
Jul 29, 2024
Merged

Siege rework #1

merged 21 commits into from
Jul 29, 2024

Conversation

MisterNorwood
Copy link
Collaborator

Merge siege rework to mian

Supernoobv and others added 21 commits July 6, 2024 09:43
…orge-Remaintained

# Conflicts:
#	src/main/java/com/flansmod/warforge/server/Siege.java
… one current use of this addition being the automatic siege failure when no attackers are detected within any of the chunks in a 3x3 centered on the siege block's chunk.
…ying any other faction's ability to siege or claim this chunk for a configurable amount of time. Also cleans up combat log handling.
…otal abandon time, fix formatting issue with time left on conquered chunks, and fix array indexing off by one error with storing nbt for conquered chunks.
@MisterNorwood MisterNorwood merged commit fcc7e48 into master Jul 29, 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