Upstream/ProtocolLib
1
0
Fork 0
mirror of https://github.com/dmulloy2/ProtocolLib.git synced 2024-11-23 19:16:14 +01:00
Code Issues Projects Releases Wiki Activity

switch to a queue for queued scheduled packets (#1598)

Browse Source
This commit is contained in:
Pasqual Koschmieder 2022-05-26 05:24:59 +02:00 committed by GitHub
parent 7bfee67a29
commit 764195bd55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/comphenix/protocol/events/NetworkMarker.java
View File

@ -4,7 +4,9 @@ import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.ProtocolManager;
import com.google.common.base.Preconditions;
import java.util.Collections;
import java.util.Deque;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.Set;
import javax.annotation.Nonnull;
import org.bukkit.entity.Player;
@ -23,7 +25,7 @@ public class NetworkMarker {
// Post-processing of the packet
private Set<PacketPostListener> postListeners;
private Set<ScheduledPacket> scheduledPackets;
private Deque<ScheduledPacket> scheduledPackets;
/**
* Construct a new network marker.
@ -68,7 +70,7 @@ public class NetworkMarker {
* @param marker - the marker.
* @return The list, or NULL if not found or initialized.
*/
public static Set<ScheduledPacket> readScheduledPackets(NetworkMarker marker) {
public static Deque<ScheduledPacket> readScheduledPackets(NetworkMarker marker) {
return marker.scheduledPackets;
}
@ -129,16 +131,14 @@ public class NetworkMarker {
}
/**
* Retrieve a list of packets that will be schedule (in-order) when the current packet has been successfully
* transmitted.
* <p>
* This list is modifiable.
* Retrieve a modifiable queue of packets that will be schedule (in-order) when the current packet has been
* successfully transmitted.
*
* @return List of packets that will be scheduled.
* @return the queue of packets to schedule after this packet, in order.
*/
public Set<ScheduledPacket> getScheduledPackets() {
public Deque<ScheduledPacket> getScheduledPackets() {
if (this.scheduledPackets == null) {
this.scheduledPackets = new HashSet<>();
this.scheduledPackets = new LinkedList<>();
}
return this.scheduledPackets;

7
src/main/java/com/comphenix/protocol/injector/NetworkProcessor.java
View File

@ -7,7 +7,7 @@ import com.comphenix.protocol.events.NetworkMarker;
import com.comphenix.protocol.events.PacketEvent;
import com.comphenix.protocol.events.PacketPostListener;
import com.comphenix.protocol.events.ScheduledPacket;
import java.util.Set;
import java.util.Deque;
/**
* Represents a processor for network markers.
@ -61,11 +61,12 @@ public class NetworkProcessor {
*/
private void sendScheduledPackets(NetworkMarker marker) {
// Next, invoke post packet transmission
Set<ScheduledPacket> scheduled = NetworkMarker.readScheduledPackets(marker);
Deque<ScheduledPacket> scheduled = NetworkMarker.readScheduledPackets(marker);
ProtocolManager manager = ProtocolLibrary.getProtocolManager();
if (scheduled != null) {
for (ScheduledPacket packet : scheduled) {
ScheduledPacket packet;
while ((packet = scheduled.poll()) != null) {
packet.schedule(manager);
}
}