Skip to content

1.20 add set command and add null check in MobsLevelingEvents #38

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.

Sign up for GitHub

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

Open
jaimejaime19 wants to merge 2 commits into
base: 1.20
Choose a base branch
from
Open

1.20 add set command and add null check in MobsLevelingEvents #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa59cc1
Add set command to set level directly
jaimejaime19 Sep 11, 2024
99f2ecd
Add null check in getAttributeBonuses
jaimejaime19 Sep 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions src/main/java/daripher/autoleveling/command/AutoLevelingCommands.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,17 @@ public static void onRegisterCommands(RegisterCommandsEvent event) {
.executes(AutoLevelingCommands::executeGetLevelCommand)))
.requires(AutoLevelingCommands::hasPermission);
event.getDispatcher().register(getGlobalLevelCommand);
LiteralArgumentBuilder<CommandSourceStack> setGlobalLevelCommand =
Commands.literal("autoleveling")
.then(
Commands.literal("level")
.then(
Commands.literal("set")
.then(
Commands.argument("value", IntegerArgumentType.integer())
.executes(AutoLevelingCommands::executeSetLevelCommand))))
.requires(AutoLevelingCommands::hasPermission);
event.getDispatcher().register(setGlobalLevelCommand);
}

private static int executeAddLevelCommand(CommandContext<CommandSourceStack> ctx) {
Expand All @@ -56,6 +67,14 @@ private static int executeGetLevelCommand(CommandContext<CommandSourceStack> ctx
return 1;
}

private static int executeSetLevelCommand(CommandContext<CommandSourceStack> ctx) {
MinecraftServer server = ctx.getSource().getServer();
GlobalLevelingData globalLevelingData = GlobalLevelingData.get(server);
Integer newLevel = ctx.getArgument("value", Integer.class);
globalLevelingData.setLevel(newLevel);
return 1;
}

private static boolean hasPermission(CommandSourceStack commandSourceStack) {
return commandSourceStack.hasPermission(2);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/daripher/autoleveling/event/MobsLevelingEvents.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ public static void applyAttributeBonuses(LivingEntity entity) {

private static Map<Attribute, AttributeModifier> getAttributeBonuses(LivingEntity entity) {
LevelingSettings settings = getLevelingSettings(entity);
if (settings.attributeModifiers().isEmpty()) {
if (settings.attributeModifiers() == null || settings.attributeModifiers().isEmpty()) {
return Config.getAttributeBonuses();
}
return settings.attributeModifiers();
Expand Down