nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-11-26 16:30:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/EnableNotificationsComposer' into 'dev'

Browse Source 
Bubble Alerts now work without debugging mode on

See merge request morningstar/Arcturus-Community!406
This commit is contained in:
Remco 2021-02-15 22:24:57 +00:00
commit a1af30b8e3
5 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sqlupdates/3_0_BETA_1 to 3_0_0-RC-1.sql
View File

@ -4,3 +4,6 @@ INSERT INTO `emulator_texts` (`key`, `value`) VALUES ('wired.variable.roomname',
INSERT INTO `emulator_texts` (`key`, `value`) VALUES ('wired.variable.user_count', '%user_count%'); INSERT INTO `emulator_texts` (`key`, `value`) VALUES ('wired.variable.user_count', '%user_count%');
INSERT INTO `emulator_texts` (`key`, `value`) VALUES ('wired.variable.owner', '%owner%'); INSERT INTO `emulator_texts` (`key`, `value`) VALUES ('wired.variable.owner', '%owner%');
INSERT INTO `emulator_texts` (`key`, `value`) VALUES ('wired.variable.item_count', '%item_count%'); INSERT INTO `emulator_texts` (`key`, `value`) VALUES ('wired.variable.item_count', '%item_count%');
-- Enable bubble alerts
INSERT INTO `emulator_settings` (`key`, `value`) VALUES ('bubblealerts.enabled', '1');

4
src/main/java/com/eu/habbo/messages/incoming/handshake/SecureLoginEvent.java
View File

@ -19,7 +19,7 @@ import com.eu.habbo.messages.outgoing.gamecenter.GameCenterGameListComposer;
import com.eu.habbo.messages.outgoing.generic.alerts.GenericAlertComposer; import com.eu.habbo.messages.outgoing.generic.alerts.GenericAlertComposer;
import com.eu.habbo.messages.outgoing.generic.alerts.MessagesForYouComposer; import com.eu.habbo.messages.outgoing.generic.alerts.MessagesForYouComposer;
import com.eu.habbo.messages.outgoing.habboway.nux.NewUserIdentityComposer; import com.eu.habbo.messages.outgoing.habboway.nux.NewUserIdentityComposer;
import com.eu.habbo.messages.outgoing.handshake.DebugConsoleComposer; import com.eu.habbo.messages.outgoing.handshake.EnableNotificationsComposer;
import com.eu.habbo.messages.outgoing.handshake.SecureLoginOKComposer; import com.eu.habbo.messages.outgoing.handshake.SecureLoginOKComposer;
import com.eu.habbo.messages.outgoing.handshake.AvailabilityStatusMessageComposer; import com.eu.habbo.messages.outgoing.handshake.AvailabilityStatusMessageComposer;
import com.eu.habbo.messages.outgoing.handshake.PingComposer; import com.eu.habbo.messages.outgoing.handshake.PingComposer;
@ -122,7 +122,7 @@ public class SecureLoginEvent extends MessageHandler {
messages.add(new UserPermissionsComposer(this.client.getHabbo()).compose()); messages.add(new UserPermissionsComposer(this.client.getHabbo()).compose());
messages.add(new AvailabilityStatusMessageComposer(true, false, true).compose()); messages.add(new AvailabilityStatusMessageComposer(true, false, true).compose());
messages.add(new PingComposer().compose()); messages.add(new PingComposer().compose());
messages.add(new DebugConsoleComposer(Emulator.debugging).compose()); messages.add(new EnableNotificationsComposer(Emulator.getConfig().getBoolean("bubblealerts.enabled", true)).compose());
messages.add(new UserAchievementScoreComposer(this.client.getHabbo()).compose()); messages.add(new UserAchievementScoreComposer(this.client.getHabbo()).compose());
messages.add(new IsFirstLoginOfDayComposer(true).compose()); messages.add(new IsFirstLoginOfDayComposer(true).compose());
messages.add(new UnknownComposer5().compose()); messages.add(new UnknownComposer5().compose());

2
src/main/java/com/eu/habbo/messages/outgoing/Outgoing.java
View File

@ -116,7 +116,7 @@ public class Outgoing {
public final static int CatalogModeComposer = 3828; // PRODUCTION-201611291003-338511768 public final static int CatalogModeComposer = 3828; // PRODUCTION-201611291003-338511768
public final static int ChangeNameUpdateComposer = 118; // PRODUCTION-201611291003-338511768 public final static int ChangeNameUpdateComposer = 118; // PRODUCTION-201611291003-338511768
public final static int AddFloorItemComposer = 1534; // PRODUCTION-201611291003-338511768 public final static int AddFloorItemComposer = 1534; // PRODUCTION-201611291003-338511768
public final static int DebugConsoleComposer = 3284; // PRODUCTION-201611291003-338511768 public final static int EnableNotificationsComposer = 3284; // PRODUCTION-201611291003-338511768
public final static int HallOfFameComposer = 3005; // PRODUCTION-201611291003-338511768 public final static int HallOfFameComposer = 3005; // PRODUCTION-201611291003-338511768
public final static int WiredSavedComposer = 1155; // PRODUCTION-201611291003-338511768 public final static int WiredSavedComposer = 1155; // PRODUCTION-201611291003-338511768
public final static int RoomPaintComposer = 2454; // PRODUCTION-201611291003-338511768 public final static int RoomPaintComposer = 2454; // PRODUCTION-201611291003-338511768

20
src/main/java/com/eu/habbo/messages/outgoing/handshake/DebugConsoleComposer.java
View File

@ -1,20 +0,0 @@
package com.eu.habbo.messages.outgoing.handshake;
import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.MessageComposer;
import com.eu.habbo.messages.outgoing.Outgoing;
public class DebugConsoleComposer extends MessageComposer {
private final boolean debugging;
public DebugConsoleComposer(boolean debugging) {
this.debugging = debugging;
}
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.DebugConsoleComposer);
this.response.appendBoolean(this.debugging);
return this.response;
}
}

20
src/main/java/com/eu/habbo/messages/outgoing/handshake/EnableNotificationsComposer.java Normal file
View File

@ -0,0 +1,20 @@
package com.eu.habbo.messages.outgoing.handshake;
import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.MessageComposer;
import com.eu.habbo.messages.outgoing.Outgoing;
public class EnableNotificationsComposer extends MessageComposer {
private final boolean enabled;
public EnableNotificationsComposer(boolean enabled) {
this.enabled = enabled;
}
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.EnableNotificationsComposer);
this.response.appendBoolean(this.enabled);
return this.response;
}
}