From 7afc3e52603ba2266e806e8268db891a8ba2fbf4 Mon Sep 17 00:00:00 2001 From: SquidDev Date: Tue, 2 Apr 2019 21:33:55 +0100 Subject: [PATCH] And fix the build failing --- build.gradle | 6 ++---- .../shared/pocket/core/PocketServerComputer.java | 3 +-- src/main/resources/assets/computercraft/lang/es_es.json | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 038df84f45..9e76bee8fd 100644 --- a/build.gradle +++ b/build.gradle @@ -268,16 +268,14 @@ task compressJson(dependsOn: jar) { assemble.dependsOn compressJson -/* curseforge { apiKey = project.hasProperty('curseForgeApiKey') ? project.curseForgeApiKey : '' project { id = '282001' - releaseType = 'release' - changelog = "Release notes can be found on the GitHub repository (https://github.com/SquidDev-CC/CC-Tweaked/releases/tag/v${project.version})." + releaseType = 'beta' + changelog = "Release notes can be found on the GitHub repository (https://github.com/SquidDev-CC/CC-Tweaked/releases/tag/v${mc_version}-${mod_version})." } } -*/ publishing { publications { diff --git a/src/main/java/dan200/computercraft/shared/pocket/core/PocketServerComputer.java b/src/main/java/dan200/computercraft/shared/pocket/core/PocketServerComputer.java index 8008f8714e..f805055472 100644 --- a/src/main/java/dan200/computercraft/shared/pocket/core/PocketServerComputer.java +++ b/src/main/java/dan200/computercraft/shared/pocket/core/PocketServerComputer.java @@ -46,11 +46,10 @@ public PocketServerComputer( World world, int computerID, String label, int inst @Nullable @Override - @Deprecated public Entity getEntity() { Entity entity = m_entity; - if( entity == null || m_stack == null || entity.removed ) return null; + if( entity == null || m_stack == null || !entity.isAlive() ) return null; if( entity instanceof EntityPlayer ) { diff --git a/src/main/resources/assets/computercraft/lang/es_es.json b/src/main/resources/assets/computercraft/lang/es_es.json index c0709f11ec..afec3f007e 100644 --- a/src/main/resources/assets/computercraft/lang/es_es.json +++ b/src/main/resources/assets/computercraft/lang/es_es.json @@ -46,8 +46,8 @@ "upgrade.computercraft.wireless_modem_advanced.adjective": "ender", "upgrade.computercraft.speaker.adjective": "ruidosa", - "chat.computercraft.wired_modem.peripheral_connected": "El periférico "%s" se conectó a la red", - "chat.computercraft.wired_modem.peripheral_disconnected": "El periférico "%s" se desconectó de la red", + "chat.computercraft.wired_modem.peripheral_connected": "El periférico \"%s\" se conectó a la red", + "chat.computercraft.wired_modem.peripheral_disconnected": "El periférico \"%s\" se desconectó de la red", "gui.computercraft.config.computer_space_limit": "Límite de memoria de ordenadores (en bytes)", "gui.computercraft.config.floppy_space_limit": "Límite de memoria de disquetes (en bytes)",