nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-07-04 06:15:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
KrewsOrg 2019-10-19 16:50:39 +01:00
commit eb9a38871d
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/eu/habbo/habbohotel/rooms/Room.java
View File

@ -3244,17 +3244,17 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
}
public THashSet<HabboItem> getItemsAt(RoomTile tile) {
THashSet<HabboItem> items = new THashSet<>(0);
if (tile == null)
return items;
if (this.loaded) {
if (this.tileCache.containsKey(tile)) {
return this.tileCache.get(tile);
}
}
THashSet<HabboItem> items = new THashSet<>(0);
if (tile == null)
return items;
TIntObjectIterator<HabboItem> iterator = this.roomItems.iterator();
for (int i = this.roomItems.size(); i-- > 0; ) {
@ -3682,6 +3682,7 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
for (Habbo habbo : this.getHabbos()) {
if (habbo.getClient() == null) {
this.removeHabbo(habbo, true);
continue;
}
habbo.getClient().sendResponse(message);

10
src/main/java/com/eu/habbo/habbohotel/wired/highscores/WiredHighscoreManager.java
View File

@ -1,6 +1,8 @@
package com.eu.habbo.habbohotel.wired.highscores;
import com.eu.habbo.Emulator;
import com.eu.habbo.plugin.EventHandler;
import com.eu.habbo.plugin.events.emulator.EmulatorLoadedEvent;
import java.sql.Connection;
import java.sql.PreparedStatement;
@ -29,12 +31,16 @@ public class WiredHighscoreManager {
this.data.clear();
this.loadHighscoreData();
Emulator.getLogging().logStart("Highscore Manager -> Loaded! (" + (System.currentTimeMillis() - millis) + " MS, " + this.data.size() + " items)");
}
@EventHandler
public static void onEmulatorLoaded(EmulatorLoadedEvent event) {
if (midnightUpdater != null) {
midnightUpdater.cancel(true);
}
midnightUpdater = Emulator.getThreading().run(new WiredHighscoreMidnightUpdater(), WiredHighscoreMidnightUpdater.getNextUpdaterRun());
Emulator.getLogging().logStart("Highscore Manager -> Loaded! (" + (System.currentTimeMillis() - millis) + " MS, " + this.data.size() + " items)");
}
public void dispose() {

3
src/main/java/com/eu/habbo/plugin/PluginManager.java
View File

@ -20,12 +20,14 @@ import com.eu.habbo.habbohotel.rooms.*;
import com.eu.habbo.habbohotel.users.HabboInventory;
import com.eu.habbo.habbohotel.users.HabboManager;
import com.eu.habbo.habbohotel.wired.WiredHandler;
import com.eu.habbo.habbohotel.wired.highscores.WiredHighscoreManager;
import com.eu.habbo.messages.PacketManager;
import com.eu.habbo.messages.incoming.floorplaneditor.FloorPlanEditorSaveEvent;
import com.eu.habbo.messages.incoming.hotelview.HotelViewRequestLTDAvailabilityEvent;
import com.eu.habbo.messages.incoming.users.ChangeNameCheckUsernameEvent;
import com.eu.habbo.messages.outgoing.catalog.DiscountComposer;
import com.eu.habbo.plugin.events.emulator.EmulatorConfigUpdatedEvent;
import com.eu.habbo.plugin.events.emulator.EmulatorLoadedEvent;
import com.eu.habbo.plugin.events.roomunit.RoomUnitLookAtPointEvent;
import com.eu.habbo.plugin.events.users.*;
import com.eu.habbo.threading.runnables.RoomTrashing;
@ -322,6 +324,7 @@ public class PluginManager {
this.methods.add(InteractionFootballGate.class.getMethod("onUserExitRoomEvent", UserExitRoomEvent.class));
this.methods.add(InteractionFootballGate.class.getMethod("onUserSavedLookEvent", UserSavedLookEvent.class));
this.methods.add(PluginManager.class.getMethod("globalOnConfigurationUpdated", EmulatorConfigUpdatedEvent.class));
this.methods.add(WiredHighscoreManager.class.getMethod("onEmulatorLoaded", EmulatorLoadedEvent.class));
} catch (NoSuchMethodException e) {
Emulator.getLogging().logStart("Failed to define default events!");
Emulator.getLogging().logErrorLine(e);