Per-team togglable friendlyfire #148
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Collaborator
There was a problem hiding this comment. Instead of having a new command for the friendly fire option, it should be added to the existing modify command |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| package io.icker.factions.command; | ||
|
|
||
| import com.mojang.brigadier.arguments.BoolArgumentType; | ||
| import com.mojang.brigadier.context.CommandContext; | ||
| import com.mojang.brigadier.exceptions.CommandSyntaxException; | ||
| import com.mojang.brigadier.tree.LiteralCommandNode; | ||
|
|
||
| import io.icker.factions.api.persistents.Faction; | ||
| import io.icker.factions.util.Command; | ||
| import io.icker.factions.util.Message; | ||
|
|
||
| import net.minecraft.server.command.CommandManager; | ||
| import net.minecraft.server.command.ServerCommandSource; | ||
| import net.minecraft.server.network.ServerPlayerEntity; | ||
| import net.minecraft.text.Text; | ||
| import net.minecraft.util.Formatting; | ||
|
|
||
| public class FriendlyFireCommand implements Command { | ||
| private int execute(CommandContext<ServerCommandSource> context) throws CommandSyntaxException { | ||
| boolean enabled = BoolArgumentType.getBool(context, "enabled"); | ||
|
|
||
| ServerCommandSource source = context.getSource(); | ||
| ServerPlayerEntity player = source.getPlayerOrThrow(); | ||
|
|
||
| Faction faction = Command.getUser(player).getFaction(); | ||
|
|
||
| faction.setFriendlyFire(enabled); | ||
|
|
||
| new Message( | ||
| Text.translatable( | ||
| enabled | ||
| ? "factions.command.friendlyfire.success.enabled" | ||
| : "factions.command.friendlyfire.success.disabled")) | ||
| .format(enabled ? Formatting.GREEN : Formatting.RED) | ||
| .prependFaction(faction) | ||
| .send(player, false); | ||
|
|
||
| return 1; | ||
| } | ||
|
|
||
| public LiteralCommandNode<ServerCommandSource> getNode() { | ||
| return CommandManager.literal("friendlyfire") | ||
| .requires( | ||
| Requires.multiple( | ||
| Requires.hasPerms("factions.friendlyfire.toggle", 0), | ||
| Requires.isLeader())) | ||
| .then( | ||
| CommandManager.argument("enabled", BoolArgumentType.bool()) | ||
| .executes(this::execute)) | ||
| .build(); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,6 +34,7 @@ public class FactionsManager { | |
|
|
||
| public static void register() { | ||
| ServerLifecycleEvents.SERVER_STARTED.register(FactionsManager::serverStarted); | ||
| ServerLifecycleEvents.SERVER_STOPPING.register(FactionsManager::serverStopping); | ||
|
Author
There was a problem hiding this comment. oh sorry, this was supposed to be for another pr also includes: #148 (comment)
Author
There was a problem hiding this comment. so basically, whenever the server shuts down before the save interval is triggered, all data stored in memory is just gone which gives me an "Invalid player data" error when attempting to join my dev server
Collaborator
There was a problem hiding this comment. The server saves itself as it stops, I’m not sure why this is needed |
||
| FactionEvents.MODIFY.register(FactionsManager::factionModified); | ||
| FactionEvents.MEMBER_JOIN.register(FactionsManager::memberChange); | ||
| FactionEvents.MEMBER_LEAVE.register(FactionsManager::memberChange); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of using a boxed boolean type, this should use an enum with either true, false, or use config. I don't think our serialization system can handle this correctly as is and it would be more readable.