Upstream/SongodaCore
1
0
Fork 0
mirror of https://github.com/songoda/SongodaCore.git synced 2024-12-17 22:17:37 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Brianna 2020-07-30 07:37:01 -05:00
commit 60e013bd96
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -4,7 +4,7 @@ stages:
variables: variables:
name: "SongodaCore" name: "SongodaCore"
path: "/builds/$CI_PROJECT_PATH" path: "/builds/$CI_PROJECT_PATH"
version: "2.3.45" version: "2.3.46"
build: build:
stage: build stage: build

6
Core/src/main/java/com/songoda/core/compatibility/CompatibleMaterial.java
View File

@ -30,7 +30,7 @@ public enum CompatibleMaterial {
*/ */
/* 1.16 */ /* 1.16 */
ANCIENT_DEBRIES(), ANCIENT_DEBRIS(),
BASALT(), BASALT(),
BLACKSTONE(), BLACKSTONE(),
BLACKSTONE_STAIRS(), BLACKSTONE_STAIRS(),
@ -1356,10 +1356,10 @@ public enum CompatibleMaterial {
if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_13)) { // Flattening if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_13)) { // Flattening
return CompatibleMaterial.getMaterialFromNewBlock(block); return CompatibleMaterial.getMaterialFromNewBlock(block);
} else { // Pre-Flattening } else { // Pre-Flattening
if(block != null){ if(block != null) {
if (block.getData() != 0) { if (block.getData() != 0) {
for (CompatibleMaterial cm : CompatibleMaterial.values()) { for (CompatibleMaterial cm : CompatibleMaterial.values()) {
if (cm.getMaterial().equals(block.getType())) { if (cm.isValidItem() && !cm.usesCompatibility() && cm.getMaterial() != null && cm.getMaterial().equals(block.getType())) {
if (cm.getData() == block.getData()) { if (cm.getData() == block.getData()) {
return cm; return cm;
} }