mirror of
https://git.krews.org/morningstar/Arcturus-Community.git
synced 2025-01-18 23:46:28 +01:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
52da0df768
@ -31,6 +31,8 @@ When making an bug report or a feature request use the template we provide so th
|
|||||||
- Alejandro
|
- Alejandro
|
||||||
- Harmony
|
- Harmony
|
||||||
- Quadral (Pathfinder)
|
- Quadral (Pathfinder)
|
||||||
|
- Skeletor
|
||||||
|
- z
|
||||||
|
|
||||||
## Discord ##
|
## Discord ##
|
||||||
Join us on Discord at https://discord.gg/BzfFsTp
|
Join us on Discord at https://discord.gg/BzfFsTp
|
||||||
|
@ -12,6 +12,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
|
|||||||
import com.eu.habbo.habbohotel.users.Habbo;
|
import com.eu.habbo.habbohotel.users.Habbo;
|
||||||
import com.eu.habbo.habbohotel.users.HabboItem;
|
import com.eu.habbo.habbohotel.users.HabboItem;
|
||||||
import com.eu.habbo.habbohotel.wired.WiredHandler;
|
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.Event;
|
||||||
import com.eu.habbo.plugin.events.games.GameHabboJoinEvent;
|
import com.eu.habbo.plugin.events.games.GameHabboJoinEvent;
|
||||||
import com.eu.habbo.plugin.events.games.GameHabboLeaveEvent;
|
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().setCurrentGame(this.getClass());
|
||||||
habbo.getHabboInfo().setGamePlayer(player);
|
habbo.getHabboInfo().setGamePlayer(player);
|
||||||
}
|
}
|
||||||
|
habbo.getClient().sendResponse(new GuideSessionPartnerIsPlayingComposer(true));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
@ -94,7 +95,7 @@ public abstract class Game implements Runnable {
|
|||||||
habbo.getHabboInfo().getGamePlayer().reset();
|
habbo.getHabboInfo().getGamePlayer().reset();
|
||||||
habbo.getHabboInfo().setCurrentGame(null);
|
habbo.getHabboInfo().setCurrentGame(null);
|
||||||
habbo.getHabboInfo().setGamePlayer(null);
|
habbo.getHabboInfo().setGamePlayer(null);
|
||||||
|
habbo.getClient().sendResponse(new GuideSessionPartnerIsPlayingComposer(false));
|
||||||
if (this.countsAchievements && this.endTime > this.startTime) {
|
if (this.countsAchievements && this.endTime > this.startTime) {
|
||||||
AchievementManager.progressAchievement(habbo, Emulator.getGameEnvironment().getAchievementManager().getAchievement("GamePlayed"));
|
AchievementManager.progressAchievement(habbo, Emulator.getGameEnvironment().getAchievementManager().getAchievement("GamePlayed"));
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user