Skip to content

Commit 4a20da4

Browse files
committed
merge: branch 'bugfix/player-hider-not-updating' into develop
2 parents a2dbabc + 1ff68bc commit 4a20da4

File tree

6 files changed

+13
-10
lines changed

6 files changed

+13
-10
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
java
33
id("com.gradleup.shadow") version ("8.3.5")
4-
id("io.papermc.paperweight.userdev") version ("1.7.7")
4+
id("io.papermc.paperweight.userdev") version ("2.0.0-beta.8")
55
}
66

77
group = "team.devblook"

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
org.gradle.caching=true
22
org.gradle.parallel=true
33
org.gradle.jvmargs='-Dfile.encoding=UTF-8'
4-
projectVersion=1.7.0
4+
projectVersion=1.7.1
55
libsPackage=team.devblook.akropolis.libs

gradle/wrapper/gradle-wrapper.jar

79 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ done
8686
# shellcheck disable=SC2034
8787
APP_BASE_NAME=${0##*/}
8888
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89-
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90-
' "$PWD" ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
9190

9291
# Use the maximum available, or set MAX_FD != -1 to use that value.
9392
MAX_FD=maximum

src/main/java/team/devblook/akropolis/module/modules/hotbar/items/PlayerHider.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,16 @@ public PlayerHider(HotbarManager hotbarManager, ItemStack item, int slot, String
6161
ItemStack hiddenItem = ItemStackBuilder.getItemStack(config.getConfigurationSection("player_hider.hidden")).build();
6262
ItemStack notHiddenItem = ItemStackBuilder.getItemStack(config.getConfigurationSection("player_hider.not_hidden")).build();
6363

64-
ItemMeta playerHiderMeta = hiddenItem.getItemMeta();
65-
PersistentDataContainer playerHiderContainer = playerHiderMeta.getPersistentDataContainer();
66-
playerHiderContainer.set(NamespacedKey.minecraft("hotbar-item"), PersistentDataType.STRING, keyValue);
64+
ItemMeta hiddenMeta = hiddenItem.getItemMeta();
65+
PersistentDataContainer hiddenContainer = hiddenMeta.getPersistentDataContainer();
66+
hiddenContainer.set(NamespacedKey.minecraft("hotbar-item"), PersistentDataType.STRING, keyValue);
6767

68-
hiddenItem.setItemMeta(playerHiderMeta);
69-
notHiddenItem.setItemMeta(playerHiderMeta);
68+
ItemMeta notHiddenMeta = notHiddenItem.getItemMeta();
69+
PersistentDataContainer notHiddenContainer = notHiddenMeta.getPersistentDataContainer();
70+
notHiddenContainer.set(NamespacedKey.minecraft("hotbar-item"), PersistentDataType.STRING, keyValue);
71+
72+
hiddenItem.setItemMeta(hiddenMeta);
73+
notHiddenItem.setItemMeta(notHiddenMeta);
7074

7175
this.hiddenItem = hiddenItem;
7276
this.notHiddenItem = notHiddenItem;

0 commit comments

Comments
 (0)