Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Alejandro 2020-02-04 14:24:20 +02:00
commit 52da0df768
2 changed files with 5 additions and 2 deletions

View File

@ -31,6 +31,8 @@ When making an bug report or a feature request use the template we provide so th
- Alejandro
- Harmony
- Quadral (Pathfinder)
- Skeletor
- z
## Discord ##
Join us on Discord at https://discord.gg/BzfFsTp

View File

@ -12,6 +12,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.habbohotel.wired.WiredHandler;
import com.eu.habbo.messages.outgoing.guides.GuideSessionPartnerIsPlayingComposer;
import com.eu.habbo.plugin.Event;
import com.eu.habbo.plugin.events.games.GameHabboJoinEvent;
import com.eu.habbo.plugin.events.games.GameHabboLeaveEvent;
@ -68,7 +69,7 @@ public abstract class Game implements Runnable {
habbo.getHabboInfo().setCurrentGame(this.getClass());
habbo.getHabboInfo().setGamePlayer(player);
}
habbo.getClient().sendResponse(new GuideSessionPartnerIsPlayingComposer(true));
return true;
}
} catch (Exception e) {
@ -94,7 +95,7 @@ public abstract class Game implements Runnable {
habbo.getHabboInfo().getGamePlayer().reset();
habbo.getHabboInfo().setCurrentGame(null);
habbo.getHabboInfo().setGamePlayer(null);
habbo.getClient().sendResponse(new GuideSessionPartnerIsPlayingComposer(false));
if (this.countsAchievements && this.endTime > this.startTime) {
AchievementManager.progressAchievement(habbo, Emulator.getGameEnvironment().getAchievementManager().getAchievement("GamePlayed"));
}