Skip to content

Commit e597c65

Browse files
authored
Correctif meteo wand and book dans singu (#1119)
* fix meteo wand * je croise les fesses pour que ça marche, va falloir redonner les books au joueur qui en ont deja
1 parent dd88f73 commit e597c65

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

src/main/java/fr/openmc/core/features/dream/listeners/dream/PlayerSleepListener.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ public void onPlayerSleep(PlayerBedEnterEvent event) {
4949

5050
@EventHandler
5151
public void onNightSkip(TimeSkipEvent event) {
52-
5352
for (UUID uuid : playersDreaming) {
5453
Player player = Bukkit.getPlayer(uuid);
5554
if (player == null) continue;
@@ -65,6 +64,6 @@ public void run() {
6564
}
6665
}.runTaskLater(OMCPlugin.getInstance(), 20L * 5);
6766
}
68-
if (event.getSkipReason() == TimeSkipEvent.SkipReason.NIGHT_SKIP) playersDreaming.clear();
67+
playersDreaming.clear();
6968
}
7069
}

src/main/java/fr/openmc/core/features/dream/models/registry/DreamEnchantment.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public abstract class DreamEnchantment {
3535
public abstract EnchantmentRegistryEntry.EnchantmentCost getMaximalmCost();
3636

3737
public DreamItem getEnchantedBookItem(int level) {
38-
return new DreamItem(getKey().asMinimalString()) {
38+
return new DreamItem(getKey().asMinimalString() + level) {
3939
@Override
4040
public ItemStack getVanilla() {
4141
return getEnchantedBook(level);
@@ -64,9 +64,7 @@ private ItemStack getEnchantedBook(int level) {
6464
.registryAccess()
6565
.getRegistry(RegistryKey.ENCHANTMENT);
6666

67-
Enchantment enchantment = enchantmentRegistry.getOrThrow(
68-
RegistryKey.ENCHANTMENT.typedKey(getKey())
69-
);
67+
Enchantment enchantment = enchantmentRegistry.getOrThrow(RegistryKey.ENCHANTMENT.typedKey(getKey()));
7068

7169
meta.addStoredEnchant(enchantment, level, false);
7270
bookEnchanted.setItemMeta(meta);

src/main/java/fr/openmc/core/features/dream/registries/DreamEnchantementRegistry.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,12 @@ public static void init() {
6161
dreamEnchantments.put(key, dreamEnchant);
6262
enchantments.put(key, enchantment);
6363

64+
for (int level = 1; level <= dreamEnchant.getMaxLevel(); level++)
65+
DreamItemRegistry.register(
66+
key.asMinimalString() + level,
67+
dreamEnchant.getEnchantedBookItem(level)
68+
);
69+
6470
if (dreamEnchant instanceof Listener listener) {
6571
OMCPlugin.registerEvents(listener);
6672
}

src/main/java/fr/openmc/core/features/dream/registries/DreamItemRegistry.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@ public static void init() {
128128
registerDreamItem(new MeteoWand("omc_dream:meteo_wand"));
129129
registerDreamItem(new MetalDetector("omc_dream:metal_detector"));
130130

131+
// # ENCHANTEMENTS
132+
133+
131134
CommandsManager.getHandler().register(
132135
new DreamItemCommand()
133136
);

0 commit comments

Comments
 (0)