diff --git a/doc/rendering/GUI.md b/doc/rendering/GUI.md index 37e8c6336..c7647d6b1 100644 --- a/doc/rendering/GUI.md +++ b/doc/rendering/GUI.md @@ -23,7 +23,7 @@ - Text - Items - Container (list with items, the inventory and their positions) -- GUI + - GUI - Buttons - TextField - Label diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/item/ItemEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/item/ItemEntity.kt index cf3398180..812eaf84f 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/item/ItemEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/item/ItemEntity.kt @@ -56,6 +56,10 @@ class ItemEntity(connection: PlayConnection, entityType: EntityType, data: Entit } } + override fun onAttack(attacker: Entity): Boolean { + return false + } + companion object : EntityFactory { override val RESOURCE_LOCATION: ResourceLocation = ResourceLocation("item") diff --git a/src/main/java/de/bixilon/minosoft/util/DesktopUtil.kt b/src/main/java/de/bixilon/minosoft/util/DesktopUtil.kt index 75c56bc33..7063f64ae 100644 --- a/src/main/java/de/bixilon/minosoft/util/DesktopUtil.kt +++ b/src/main/java/de/bixilon/minosoft/util/DesktopUtil.kt @@ -49,7 +49,6 @@ object DesktopUtil { Log.log(LogMessageType.GENERAL, LogLevels.INFO) { "Can not open file: $file: Eros is disabled!" } return } - // Desktop.getDesktop().open(File(path)) try { JavaFXUtil.HOST_SERVICES.showDocument(file.absolutePath)