nitro/G-Earth
1
0
Fork 0
mirror of https://github.com/sirjonasxx/G-Earth.git synced 2024-11-23 17:00:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix scheduler for Shockwave

Browse Source
This commit is contained in:
UnfamiliarLegacy 2024-06-22 01:44:54 +02:00
parent 83ce7a0f6b
commit f875eb4e29
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
G-Earth/src/main/java/gearth/protocol/HPacketFormat.java
View File

@ -1,5 +1,7 @@
package gearth.protocol; package gearth.protocol;
import gearth.extensions.parsers.HDirection;
import gearth.protocol.connection.HClient;
import gearth.protocol.packethandler.shockwave.packets.ShockPacketIncoming; import gearth.protocol.packethandler.shockwave.packets.ShockPacketIncoming;
import gearth.protocol.packethandler.shockwave.packets.ShockPacketOutgoing; import gearth.protocol.packethandler.shockwave.packets.ShockPacketOutgoing;
@ -9,6 +11,14 @@ public enum HPacketFormat {
WEDGIE_INCOMING, WEDGIE_INCOMING,
WEDGIE_OUTGOING; WEDGIE_OUTGOING;
public static HPacketFormat getFormat(HClient client, HMessage.Direction direction) {
if (client != HClient.SHOCKWAVE) {
return EVA_WIRE;
} else {
return direction == HMessage.Direction.TOCLIENT ? WEDGIE_INCOMING : WEDGIE_OUTGOING;
}
}
public HPacket createPacket(String data) { public HPacket createPacket(String data) {
switch (this) { switch (this) {
case EVA_WIRE: case EVA_WIRE:

22
G-Earth/src/main/java/gearth/services/scheduler/Scheduler.java
View File

@ -1,8 +1,12 @@
package gearth.services.scheduler; package gearth.services.scheduler;
import gearth.extensions.parsers.HDirection;
import gearth.protocol.HConnection; import gearth.protocol.HConnection;
import gearth.protocol.HMessage; import gearth.protocol.HMessage;
import gearth.protocol.HPacket; import gearth.protocol.HPacket;
import gearth.protocol.HPacketFormat;
import gearth.protocol.connection.HClient;
import gearth.protocol.connection.HState;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
@ -13,7 +17,7 @@ public class Scheduler<T extends ScheduleItem> {
private List<T> scheduleItems = new ArrayList<>(); private List<T> scheduleItems = new ArrayList<>();
public Scheduler(HConnection connection) { public Scheduler(final HConnection connection) {
new Thread(() -> { new Thread(() -> {
long t = System.currentTimeMillis(); long t = System.currentTimeMillis();
long changed = 1; long changed = 1;
@ -27,6 +31,12 @@ public class Scheduler<T extends ScheduleItem> {
e.printStackTrace(); e.printStackTrace();
} }
if (connection.getState() != HState.CONNECTED) {
continue;
}
final HClient clientType = connection.getClientType();
set.clear(); set.clear();
for (int i = size() - 1; i >= 0; i--) { for (int i = size() - 1; i >= 0; i--) {
set.add(get(i)); set.add(get(i));
@ -37,18 +47,18 @@ public class Scheduler<T extends ScheduleItem> {
Interval cur = item.getDelayProperty().get(); Interval cur = item.getDelayProperty().get();
for (int i = 0; i < changed; i++) { for (int i = 0; i < changed; i++) {
if ((t - i) % cur.getDelay() == cur.getOffset()) { if ((t - i) % cur.getDelay() == cur.getOffset()) {
HPacket hPacket = new HPacket(item.getPacketAsStringProperty().get()); final HMessage.Direction direction = item.getDestinationProperty().get();
final HPacketFormat format = HPacketFormat.getFormat(clientType, direction);
final HPacket hPacket = format.createPacket(item.getPacketAsStringProperty().get());
if (item.getDestinationProperty().get() == HMessage.Direction.TOSERVER) { if (direction == HMessage.Direction.TOSERVER) {
connection.sendToServer(hPacket); connection.sendToServer(hPacket);
} } else {
else {
connection.sendToClient(hPacket); connection.sendToClient(hPacket);
} }
} }
} }
} }
} }
long newT = System.currentTimeMillis(); long newT = System.currentTimeMillis();