Skip to content

Commit 2996d7e

Browse files
committed
Update 3 and other fixes
1 parent 2008634 commit 2996d7e

4 files changed

Lines changed: 13 additions & 4 deletions

File tree

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ plugins {
1818
boolean ci = System.getenv("CI") == "true"
1919

2020
group = 'one.armelin'
21-
version = '1.4.2'
21+
version = '1.4.3'
2222

2323
def decomp(fileCollection) {
2424
def jarFile = fileCollection.singleFile

src/main/java/one/armelin/distale/listeners/DiscordEventListener.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@ private void handleConsoleCommand(MessageReceivedEvent event) {
8585
* Handle !online command - List online players
8686
*/
8787
private void handleOnlineCommand(MessageReceivedEvent event) {
88+
if(DisTale.universe == null){
89+
event.getChannel().sendMessage("Universe is not ready.").queue();
90+
}
8891
java.util.List<PlayerRef> players = DisTale.universe.getPlayers();
8992

9093
StringBuilder response = new StringBuilder("```\n");
@@ -99,6 +102,9 @@ private void handleOnlineCommand(MessageReceivedEvent event) {
99102
* Handle !tps command - Show server TPS
100103
*/
101104
private void handleTpsCommand(MessageReceivedEvent event) {
105+
if(DisTale.universe == null){
106+
event.getChannel().sendMessage("Universe is not ready.").queue();
107+
}
102108
StringBuilder response = new StringBuilder("```\n");
103109
response.append("=============== Server TPS ===============\n");
104110
DisTale.universe.getWorlds().forEach( (name, world) -> {
@@ -183,6 +189,10 @@ private void handleChatMessage(MessageReceivedEvent event) {
183189

184190
String finalMessage = coloredMessage + replyMessage + colorlessMessage;
185191

192+
if(DisTale.universe == null){
193+
return;
194+
}
195+
186196
DisTale.universe.sendMessage(TinyMsg.parse(finalMessage));
187197
DisTale.LOGGER.atInfo().log("[Discord -> Hytale] %s: %s", discordName, messageContent);
188198
}

src/main/java/one/armelin/distale/listeners/systems/BeforeGatherMemoriesSystem.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,8 @@ public void tick(
8585
: npc.getRoleName();
8686

8787
String titleKey = role.getNameTranslationKey();
88-
boolean overridden = role.isMemoriesNameOverriden();
8988

90-
NPCMemory temp = new NPCMemory(npcRole, titleKey, overridden);
89+
NPCMemory temp = new NPCMemory(npcRole, titleKey);
9190
if (!MemoriesPlugin.get().hasRecordedMemory(temp)) {
9291
if (!playerMemories.getRecordedMemories().contains(temp)) {
9392
HytaleEventListener.onMemoryDiscovered(playerComponent, temp);

src/main/resources/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"Group": "armelin1",
33
"Name": "DisTale",
4-
"Version": "1.4.2",
4+
"Version": "1.4.3",
55
"Description": "Discord bridge for Hytale servers - Chat integration, announcements, and commands",
66
"Authors": [
77
{

0 commit comments

Comments
 (0)