mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-02 09:44:50 +02:00
03a4e7ac75
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 37262de8 PR-812: Add Registry#match(String) d6b40162 SPIGOT-4569: Add more BlockData API f9691891 PR-809: Throw a more clear error for BlockIterators with zero direction, add Vector#isZero() 91e79e19 PR-804: Added methods to get translation keys for materials, itemstacks and more 426b00d3 PR-795: Add new BiomeParameterPoint passed to BiomeProvider#getBiome 0e91ea52 SPIGOT-7224: Add events for brewing stands and campfires starting their actions CraftBukkit Changes: a50301aa5 Fix issues with fluid tag conversion and fluid #isTagged 6aeb5e4c3 SPIGOT-4569: Implement more BlockData API 7dbf862c2 PR-1131: Added methods to get translation keys for materials, itemstacks and more 7167588b1 PR-1117: Add new BiomeParameterPoint passed to BiomeProvider#getBiome 7c44152eb SPIGOT-7224: Add events for brewing stands and campfires starting their actions
103 lines
4.3 KiB
Diff
103 lines
4.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Sun, 12 Feb 2023 10:52:22 -0800
|
|
Subject: [PATCH] Add missing isFuel Material entries
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
|
|
index 7eb5413ea1d94ddacd98edb57074611dac94a41c..6bbb47d1f9d8d45326232024e82a0ebaf764fae7 100644
|
|
--- a/src/main/java/org/bukkit/Material.java
|
|
+++ b/src/main/java/org/bukkit/Material.java
|
|
@@ -7459,6 +7459,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
|
|
case ACACIA_DOOR:
|
|
case ACACIA_FENCE:
|
|
case ACACIA_FENCE_GATE:
|
|
+ case ACACIA_HANGING_SIGN: // Paper
|
|
case ACACIA_LOG:
|
|
case ACACIA_PLANKS:
|
|
case ACACIA_PRESSURE_PLATE:
|
|
@@ -7470,9 +7471,27 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
|
|
case ACACIA_WOOD:
|
|
case AZALEA:
|
|
case BAMBOO:
|
|
+ // Paper start - add missing fuels
|
|
+ case BAMBOO_BLOCK:
|
|
+ case BAMBOO_BUTTON:
|
|
+ case BAMBOO_CHEST_RAFT:
|
|
+ case BAMBOO_DOOR:
|
|
+ case BAMBOO_FENCE:
|
|
+ case BAMBOO_FENCE_GATE:
|
|
+ case BAMBOO_HANGING_SIGN:
|
|
+ // Paper end
|
|
case BAMBOO_MOSAIC:
|
|
case BAMBOO_MOSAIC_SLAB:
|
|
case BAMBOO_MOSAIC_STAIRS:
|
|
+ // Paper start - add missing fuels
|
|
+ case BAMBOO_PLANKS:
|
|
+ case BAMBOO_PRESSURE_PLATE:
|
|
+ case BAMBOO_RAFT:
|
|
+ case BAMBOO_SIGN:
|
|
+ case BAMBOO_SLAB:
|
|
+ case BAMBOO_STAIRS:
|
|
+ case BAMBOO_TRAPDOOR:
|
|
+ // Paper end
|
|
case BARREL:
|
|
case BIRCH_BOAT:
|
|
case BIRCH_BUTTON:
|
|
@@ -7480,6 +7499,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
|
|
case BIRCH_DOOR:
|
|
case BIRCH_FENCE:
|
|
case BIRCH_FENCE_GATE:
|
|
+ case BIRCH_HANGING_SIGN: // Paper
|
|
case BIRCH_LOG:
|
|
case BIRCH_PLANKS:
|
|
case BIRCH_PRESSURE_PLATE:
|
|
@@ -7520,6 +7540,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
|
|
case DARK_OAK_DOOR:
|
|
case DARK_OAK_FENCE:
|
|
case DARK_OAK_FENCE_GATE:
|
|
+ case DARK_OAK_HANGING_SIGN: // Paper
|
|
case DARK_OAK_LOG:
|
|
case DARK_OAK_PLANKS:
|
|
case DARK_OAK_PRESSURE_PLATE:
|
|
@@ -7548,6 +7569,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
|
|
case JUNGLE_DOOR:
|
|
case JUNGLE_FENCE:
|
|
case JUNGLE_FENCE_GATE:
|
|
+ case JUNGLE_HANGING_SIGN: // Paper
|
|
case JUNGLE_LOG:
|
|
case JUNGLE_PLANKS:
|
|
case JUNGLE_PRESSURE_PLATE:
|
|
@@ -7579,6 +7601,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
|
|
case MANGROVE_DOOR:
|
|
case MANGROVE_FENCE:
|
|
case MANGROVE_FENCE_GATE:
|
|
+ case MANGROVE_HANGING_SIGN: // Paper
|
|
case MANGROVE_LOG:
|
|
case MANGROVE_PLANKS:
|
|
case MANGROVE_PRESSURE_PLATE:
|
|
@@ -7596,6 +7619,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
|
|
case OAK_DOOR:
|
|
case OAK_FENCE:
|
|
case OAK_FENCE_GATE:
|
|
+ case OAK_HANGING_SIGN: // Paper
|
|
case OAK_LOG:
|
|
case OAK_PLANKS:
|
|
case OAK_PRESSURE_PLATE:
|
|
@@ -7625,6 +7649,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
|
|
case SPRUCE_DOOR:
|
|
case SPRUCE_FENCE:
|
|
case SPRUCE_FENCE_GATE:
|
|
+ case SPRUCE_HANGING_SIGN: // Paper
|
|
case SPRUCE_LOG:
|
|
case SPRUCE_PLANKS:
|
|
case SPRUCE_PRESSURE_PLATE:
|
|
@@ -7637,6 +7662,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
|
|
case STICK:
|
|
case STRIPPED_ACACIA_LOG:
|
|
case STRIPPED_ACACIA_WOOD:
|
|
+ case STRIPPED_BAMBOO_BLOCK: // Paper
|
|
case STRIPPED_BIRCH_LOG:
|
|
case STRIPPED_BIRCH_WOOD:
|
|
case STRIPPED_DARK_OAK_LOG:
|