GeyserMC/Geyser
GeyserMC
/
Geyser
mirror of https://github.com/GeyserMC/Geyser.git
4
4
Fork 3
Code Issues 103 Projects Releases Wiki Activity

Fix NPE when hovering over ender dragon

This commit is contained in:
Camotoy 2021-12-06 15:06:53 -05:00
parent 1840172c8d
commit 2953ea9513
No known key found for this signature in database
GPG Key ID: 7EEFB66FE798081F
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/org/geysermc/geyser/entity/InteractiveTagManager.java
View File

@ -66,6 +66,10 @@ public class InteractiveTagManager {
ItemMapping mapping = session.getPlayerInventory().getItemInHand().getMapping(session); ItemMapping mapping = session.getPlayerInventory().getItemInHand().getMapping(session);
String javaIdentifierStripped = mapping.getJavaIdentifier().replace("minecraft:", ""); String javaIdentifierStripped = mapping.getJavaIdentifier().replace("minecraft:", "");
EntityType entityType = interactEntity.getDefinition().entityType(); EntityType entityType = interactEntity.getDefinition().entityType();
if (entityType == null) {
// Likely a technical entity; we don't need to worry about this
return;
}
InteractiveTag interactiveTag = InteractiveTag.NONE; InteractiveTag interactiveTag = InteractiveTag.NONE;
@ -90,7 +94,7 @@ public class InteractiveTagManager {
// This animal can be fed // This animal can be fed
interactiveTag = InteractiveTag.FEED; interactiveTag = InteractiveTag.FEED;
} else { } else {
switch (interactEntity.getDefinition().entityType()) { switch (entityType) {
case BOAT: case BOAT:
if (interactEntity.getPassengers().size() < 2) { if (interactEntity.getPassengers().size() < 2) {
interactiveTag = InteractiveTag.BOARD_BOAT; interactiveTag = InteractiveTag.BOARD_BOAT;