Skip to content

Commit bb574ba

Browse files
Merge pull request CloudburstMC#1082 from PowerNukkit/v1.4/stone_slab/missing
Fix stone slabs missing in creative menu and git data missing in pterodactyl images
2 parents 43376c6 + 5f7109b commit bb574ba

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

pterodactyl-image-java11.Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ COPY src/main/resources /src/src/main/resources
1414
COPY src/test/java/cn /src/src/test/java/cn
1515
COPY src/test/resources /src/src/test/resources
1616

17+
COPY .git /src/.git
18+
1719
# Update the language submodule
1820
RUN if [ -z "$(ls -A /src/src/main/resources/lang)" ]; then git submodule update --init; fi
1921

pterodactyl-image-java8.Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ COPY src/main/resources /src/src/main/resources
1414
COPY src/test/java/cn /src/src/test/java/cn
1515
COPY src/test/resources /src/src/test/resources
1616

17+
COPY .git /src/.git
18+
1719
# Update the language submodule
1820
RUN if [ -z "$(ls -A /src/src/main/resources/lang)" ]; then git submodule update --init; fi
1921

src/main/java/cn/nukkit/item/MinecraftItemID.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,11 +175,11 @@ public enum MinecraftItemID {
175175
@PowerNukkitOnly @Since("1.3.2.0-PN") GRANITE_STAIRS,
176176
@PowerNukkitOnly @Since("1.3.2.0-PN") REAL_DOUBLE_STONE_SLAB4(true, true),
177177
@PowerNukkitOnly @Since("1.3.2.0-PN") REAL_DOUBLE_STONE_SLAB3(true, true),
178-
@PowerNukkitOnly @Since("1.3.2.0-PN") DOUBLE_STONE_SLAB4(true, true),
178+
@PowerNukkitOnly @Since("1.3.2.0-PN") DOUBLE_STONE_SLAB4,
179179
@PowerNukkitOnly @Since("1.3.2.0-PN") SCAFFOLDING,
180180
@PowerNukkitOnly @Since("1.3.2.0-PN") BAMBOO_SAPLING(false, true),
181181
@PowerNukkitOnly @Since("1.3.2.0-PN") BAMBOO,
182-
@PowerNukkitOnly @Since("1.3.2.0-PN") DOUBLE_STONE_SLAB3(true, true),
182+
@PowerNukkitOnly @Since("1.3.2.0-PN") DOUBLE_STONE_SLAB3,
183183
@PowerNukkitOnly @Since("1.3.2.0-PN") BARRIER,
184184
@PowerNukkitOnly @Since("1.3.2.0-PN") BUBBLE_COLUMN,
185185
@PowerNukkitOnly @Since("1.3.2.0-PN") TURTLE_EGG,
@@ -383,7 +383,7 @@ public enum MinecraftItemID {
383383
@PowerNukkitOnly @Since("1.3.2.0-PN") GOLD_BLOCK,
384384
@PowerNukkitOnly @Since("1.3.2.0-PN") IRON_BLOCK,
385385
@PowerNukkitOnly @Since("1.3.2.0-PN") REAL_DOUBLE_STONE_SLAB(true, true),
386-
@PowerNukkitOnly @Since("1.3.2.0-PN") DOUBLE_STONE_SLAB(true, true),
386+
@PowerNukkitOnly @Since("1.3.2.0-PN") DOUBLE_STONE_SLAB,
387387
@PowerNukkitOnly @Since("1.3.2.0-PN") BRICK_BLOCK,
388388
@PowerNukkitOnly @Since("1.3.2.0-PN") TNT,
389389
@PowerNukkitOnly @Since("1.3.2.0-PN") BOOKSHELF,
@@ -521,7 +521,7 @@ public enum MinecraftItemID {
521521
@PowerNukkitOnly @Since("1.3.2.0-PN") RED_SANDSTONE,
522522
@PowerNukkitOnly @Since("1.3.2.0-PN") RED_SANDSTONE_STAIRS,
523523
@PowerNukkitOnly @Since("1.3.2.0-PN") REAL_DOUBLE_STONE_SLAB2(true, true),
524-
@PowerNukkitOnly @Since("1.3.2.0-PN") DOUBLE_STONE_SLAB2(true, true),
524+
@PowerNukkitOnly @Since("1.3.2.0-PN") DOUBLE_STONE_SLAB2,
525525
@PowerNukkitOnly @Since("1.3.2.0-PN") SPRUCE_FENCE_GATE,
526526
@PowerNukkitOnly @Since("1.3.2.0-PN") BIRCH_FENCE_GATE,
527527
@PowerNukkitOnly @Since("1.3.2.0-PN") JUNGLE_FENCE_GATE,

0 commit comments

Comments
 (0)