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

General improvements / code maintenance #70

Merged
merged 5 commits into from
Jan 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .github/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
### 2.0.5 Release (13.01.2024)
* Updated to minigamesbox 1.3.6

### 2.0.4 Release (03.01.2024)
* Added new command /mma locale <locale> to set your locale
* Fixed GameProfile API 1.20 change
Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ repositories {
}

dependencies {
implementation("plugily.projects:MiniGamesBox-Classic:1.3.5") { isTransitive = false }
implementation("plugily.projects:MiniGamesBox-Classic:1.3.6") { isTransitive = false }
compileOnly("org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT")
compileOnly("io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT")
compileOnly("org.jetbrains:annotations:24.0.1")
compileOnly(files("lib/CorpseReborn.jar"))
}

group = "plugily.projects"
version = "2.0.4"
version = "2.0.4-SNAPSHOT2"
description = "MurderMystery"

java {
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/plugily/projects/murdermystery/arena/Arena.java
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,6 @@ public int getContributorValue(Role role, User user) {
}
Player player = user.getPlayer();
int contributor = user.getStatistic("CONTRIBUTION_" + role.name());
Bukkit.getConsoleSender().sendMessage(user.getPlayer().getName() + role.name() + "->C:" + contributor + user.getStatistic(plugin.getStatsStorage().getStatisticType("CONTRIBUTION_" + role.name())));
int increase = plugin.getPermissionsManager().getPermissionCategoryValue(role.name() + "_BOOSTER", player);
int multiplicator = plugin.getPermissionsManager().getPermissionCategoryValue("CHANCES_BOOSTER", player);
int calculatedContributor = (contributor + increase) * (multiplicator == 0 ? 1 :multiplicator);
Expand All @@ -419,7 +418,6 @@ public int getContributorValue(Role role, User user) {
} else {
detectiveContributions.put(user, calculatedContributor);
}
Bukkit.getConsoleSender().sendMessage(user.getPlayer().getName() + role.name() + "->" + calculatedContributor);
return calculatedContributor;
}

Expand Down
20 changes: 8 additions & 12 deletions src/main/resources/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,10 @@ Commands:
Executes: "murdermystery leave"
Enabled: true
'3':
Short: "kit"
Executes: "murdermystery selectkit"
Enabled: false
'4':
Short: "stats"
Executes: "murdermystery stats"
Enabled: false
'5':
'4':
Short: "top"
Executes: "murdermystery top"
Enabled: true
Expand All @@ -84,22 +80,22 @@ Database: false

# Should we enable in game rewards? See rewards.yml for more...
# You should also check out our script engine tutorial for rewards! https://tutorial.plugily.xyz
Rewards: true
Rewards: false


# Enable in game (eg. '[KIT][LEVEL] Tigerpanzer_02: hey') special formatting?
# Formatting is configurable in language.yml
# You can use PlaceholderAPI placeholders in chat format!
Plugin-Chat-Format: true

Chat:
# Enable in game (eg. '[KIT][LEVEL] Tigerpanzer_02: hey') special formatting?
# Formatting is configurable in language.yml
# You can use PlaceholderAPI placeholders in chat format!
Format: true
Separate:
# Should we enable a separate arena chat for players inside a arena
# Useful on multi arena servers that don't want the same chat for all players on the server
Arena: true
# Should spectators only write with other spectators
Spectators: true


# Should we fire some cool fireworks at locations of every player at special events such as the game end?
Firework: true

Expand Down Expand Up @@ -266,4 +262,4 @@ Sword:
# You edited it, huh? Next time hurt yourself!
Do-Not-Edit:
File-Version: 1
Core-Version: 2
Core-Version: 3