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

Removed Land Switching Hands in Flag War #134

Open
wants to merge 13 commits into
base: master
Choose a base branch
from

Conversation

RemlapVII
Copy link

Just a small edit I needed for Towny. I don't expect that this would be merged with the main branch, but I wanted to make sure that if someone needed it they can get access to this.

@ErgoAsh
Copy link

ErgoAsh commented May 24, 2014

If you want it merged - make it optional.

Made the option for chunks to change hands during a flag war toggle
able.
@RemlapVII
Copy link
Author

I've changed it to an option in the config.

@Zren
Copy link
Contributor

Zren commented May 24, 2014

Check your idents and try again. https://github.com/ElgarL/Towny/pull/134/files Mighta mixed tabs+spaces?

@RemlapVII
Copy link
Author

Should be fixed, need to double check my preferences in Netbeans. It was working after I compiled it without issue though.

@Zren
Copy link
Contributor

Zren commented May 24, 2014

Better, but not quite. You just to an 8 spaces/tab indent after if (TownyWarConfig.cancapturechunks() == true) {

 -               selection.add(worldCoord);
 -               TownCommand.checkIfSelectionIsValid(attackingTown, selection, false, 0, false);
 -               new TownClaim(plugin, null, attackingTown, selection, false, true, false).start();
 -           } catch (TownyException te) {
 -               // Couldn't claim it.
 +           if (TownyWarConfig.cancapturechunks() == true) {
 +                            // Defender loses townblock
 +                            TownyUniverse.getDataSource().removeTownBlock(townBlock);
 +                            // Attacker Claim Automatically
 +                            try {
 +                                    List<WorldCoord> selection = new ArrayList<WorldCoord>();

@RemlapVII
Copy link
Author

Tabs should be good now.

RemlapVII added 5 commits May 25, 2014 12:32
Working on making it harder to edit land in a warzone.
Added the warzone editable materials to the Flag War. Still working on
switch/chest protection.
@RemlapVII
Copy link
Author

I realized I hadn't forked my own code and was uploading test code to this. I have fixed it.

@ErgoAsh
Copy link

ErgoAsh commented May 26, 2014

Maybe instead of damage add cooldown, item and money cost.

@RemlapVII
Copy link
Author

I'll look into it but it seems I still failed to properly rollback my code to before my commit. New to using github.

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.

3 participants