1
mirror of https://github.com/CarmJos/MoeTeleport.git synced 2024-09-19 21:35:56 +00:00

[v1.1.0] 修复权限判断异常的问题

This commit is contained in:
Carm Jos 2022-01-22 18:45:19 +08:00
parent 5461063263
commit ce3226ee18
4 changed files with 49 additions and 10 deletions

38
.github/workflows/release.yml vendored Normal file
View File

@ -0,0 +1,38 @@
name: Release Version
on:
release:
types:
- published # 创建release的时候触发
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: "Set up JDK"
uses: actions/setup-java@v2
with:
java-version: '11'
distribution: 'adopt'
cache: maven
server-id: github
server-username: MAVEN_USERNAME
server-password: MAVEN_TOKEN
- name: "Package"
run: mvn -B package --file pom.xml -Dmaven.javadoc.skip=true -DskipTests
env:
MAVEN_USERNAME: ${{ github.repository_owner }}
MAVEN_TOKEN: ${{secrets.GITHUB_TOKEN}}
- name: "Upload Release Asset"
id: upload-release-asset
uses: shogo82148/actions-upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ github.event.release.upload_url }}
asset_path: asset/*.jar
asset_content_type: application/java-archive

View File

@ -13,7 +13,7 @@
<groupId>cc.carm.plugin</groupId>
<artifactId>moeteleport</artifactId>
<version>1.0.5</version>
<version>1.1.0</version>
<name>MoeTeleport</name>
<description>喵喵传送,简单的传送、设置家的插件。</description>

View File

@ -6,8 +6,8 @@ import cc.carm.plugin.moeteleport.configuration.values.ConfigValueMap;
public class PluginConfig {
public static final ConfigValueMap<String, Integer> PERMISSIONS = new ConfigValueMap<>(
"permissions", s -> s, Integer.class
public static final ConfigValueMap<Integer, String> PERMISSIONS = new ConfigValueMap<>(
"permissions", Integer::parseInt, String.class
);
public static final ConfigValueList<String> DANGEROUS_TYPES = new ConfigValueList<>(

View File

@ -41,16 +41,17 @@ public class UserManager {
}
public int getMaxHome(Player player) {
Map<String, Integer> permissions = PluginConfig.PERMISSIONS.get();
int value = PluginConfig.DEFAULT_HOME.get();
for (Map.Entry<String, Integer> entry : permissions.entrySet()) {
if (entry.getValue() > value && player.hasPermission(
Main.getInstance().getName() + "." + entry.getKey()
Map<Integer, String> permissions = PluginConfig.PERMISSIONS.get();
int current = PluginConfig.DEFAULT_HOME.get();
for (Map.Entry<Integer, String> entry : permissions.entrySet()) {
if (entry.getKey() > current && player.hasPermission(
Main.getInstance().getName() + "." + entry.getValue()
)) {
value = entry.getValue();
current = entry.getKey();
}
}
return value;
return current;
}
public HashMap<UUID, UserData> getUserDataMap() {