diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 63c3cde..6923e56 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,5 +21,8 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 + - name: Make gradlew excutable + run: chmod +x ./gradlew + - name: Build with Gradle run: ./gradlew build \ No newline at end of file diff --git a/src/main/java/org/hiedacamellia/redenvelope/core/command/CommandExecutes.java b/src/main/java/org/hiedacamellia/redenvelope/core/command/CommandExecutes.java index 3e074f4..e2d9627 100644 --- a/src/main/java/org/hiedacamellia/redenvelope/core/command/CommandExecutes.java +++ b/src/main/java/org/hiedacamellia/redenvelope/core/command/CommandExecutes.java @@ -63,6 +63,8 @@ public class CommandExecutes { ItemStack copy = mainHandItem.copy(); if(itemcount != -1) copy.setCount(itemcount); + else + itemcount = copy.getCount(); RedEnvelopePacket spell = REUtil.create(player, copy, "spell", count); spell.extraData().putString("spell",StringArgumentType.getString(context, "words")); diff --git a/src/main/java/org/hiedacamellia/redenvelope/core/event/REPlayerEvent.java b/src/main/java/org/hiedacamellia/redenvelope/core/event/REPlayerEvent.java index 598b2f6..c91221e 100644 --- a/src/main/java/org/hiedacamellia/redenvelope/core/event/REPlayerEvent.java +++ b/src/main/java/org/hiedacamellia/redenvelope/core/event/REPlayerEvent.java @@ -9,6 +9,7 @@ import net.neoforged.neoforge.event.ServerChatEvent; import net.neoforged.neoforge.event.entity.player.PlayerEvent; import net.neoforged.neoforge.event.tick.PlayerTickEvent; import net.neoforged.neoforge.network.PacketDistributor; +import org.hiedacamellia.redenvelope.core.config.ServerConfig; import org.hiedacamellia.redenvelope.core.network.RedEnvelopePacket; import org.hiedacamellia.redenvelope.core.network.RedEnvelopeStorage; import org.hiedacamellia.redenvelope.core.util.REUtil; @@ -48,7 +49,7 @@ public class REPlayerEvent { if(gameTime % 100 ==0){ var map = serverPlayer.getData(REAttachment.HONGBAO_STORAGE).copy(); map.values().forEach(hongBaoPacket -> { - if(hongBaoPacket.extraData().getLong("time") + 10 < System.currentTimeMillis()/1000){ + if(hongBaoPacket.extraData().getLong("time") + ServerConfig.TTL.get() < System.currentTimeMillis()/1000){ REUtil.withdraw(serverPlayer.server,hongBaoPacket,1); } });