EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-25 22:56:45 +01:00
Code Issues Projects Releases Wiki Activity

Fix NPE when right-clicking a >1.13 block

Browse Source
This commit is contained in:
dordsor21 2019-02-13 13:43:22 +00:00
parent 3e8308ecd7
commit 8710f2f83b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
View File

@ -1876,11 +1876,15 @@ import java.util.regex.Pattern;
eventType = PlayerBlockEventType.TELEPORT_OBJECT; eventType = PlayerBlockEventType.TELEPORT_OBJECT;
break; break;
default: default:
int blockId = ((LegacyPlotBlock) PlotSquared.get().IMP.getLegacyMappings() LegacyPlotBlock legacyPlotBlock =
.fromStringToLegacy(blockType.name())).id; (LegacyPlotBlock) PlotSquared.get().IMP.getLegacyMappings()
.fromStringToLegacy(blockType.name());
if (legacyPlotBlock != null) {
int blockId = legacyPlotBlock.id;
if (blockId > 197) { if (blockId > 197) {
eventType = PlayerBlockEventType.INTERACT_BLOCK; eventType = PlayerBlockEventType.INTERACT_BLOCK;
} }
}
break; break;
} }
lb = new BukkitLazyBlock(PlotBlock.get(block.getType().toString())); lb = new BukkitLazyBlock(PlotBlock.get(block.getType().toString()));