Merge branch 'revert-f14bd9db' into 'dev'

Revert "Merge branch 'patch-photo-extradata' into 'dev'"

See merge request morningstar/Arcturus-Community!83
This commit is contained in:
Harmonic 2020-01-23 14:26:15 -05:00
commit 6ca2973d87
2 changed files with 3 additions and 4 deletions

View File

@ -1 +0,0 @@
UPDATE `emulator_settings` SET `value`='{\"t\":%timestamp%, \"u\":\"%id%\", \"n\":\"%username%\", \"s\":%user_id%, \"w\":\"%url%\"}' WHERE (`key`='camera.extradata');

View File

@ -45,7 +45,7 @@ public class HabboInfo implements Runnable {
private TIntIntHashMap currencies;
private GamePlayer gamePlayer;
private int photoRoomId;
private long photoTimestamp;
private int photoTimestamp;
private String photoURL;
private String photoJSON;
private int webPublishTimestamp;
@ -430,11 +430,11 @@ public class HabboInfo implements Runnable {
this.photoRoomId = roomId;
}
public long getPhotoTimestamp() {
public int getPhotoTimestamp() {
return this.photoTimestamp;
}
public void setPhotoTimestamp(long photoTimestamp) {
public void setPhotoTimestamp(int photoTimestamp) {
this.photoTimestamp = photoTimestamp;
}