Upstream
/
ProtocolLib
mirror of https://github.com/dmulloy2/ProtocolLib.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge ba2b1d6595 into e1255edb32

This commit is contained in:
virustotalop 2024-04-08 06:02:07 +09:00 committed by GitHub
parent e1255edb32 ba2b1d6595
commit c01f638579
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/comphenix/protocol/events/SerializedOfflinePlayer.java
View File

@ -135,6 +135,12 @@ class SerializedOfflinePlayer implements OfflinePlayer, Serializable {
return bedSpawnLocation;
}
@Nullable
@Override
public Location getRespawnLocation() {
return null;
}
// @Override
public long getLastLogin() {
return lastLogin;
@ -219,6 +225,12 @@ class SerializedOfflinePlayer implements OfflinePlayer, Serializable {
return null;
}
@Nullable
@Override
public Location getLocation() {
return null;
}
@Override
public long getFirstPlayed() {
return firstPlayed;

7
src/main/java/com/comphenix/protocol/injector/netty/manager/NetworkManagerInjector.java
View File

@ -93,7 +93,12 @@ public class NetworkManagerInjector implements ChannelListener {
if (marker != null || MinecraftReflection.isBundlePacket(packetClass) || outboundListeners.contains(packetClass)) {
// wrap packet and construct the event
PacketType.Protocol currentProtocol = injector.getCurrentProtocol(PacketType.Sender.SERVER);
PacketContainer container = new PacketContainer(PacketRegistry.getPacketType(currentProtocol, packetClass), packet);
PacketType type = PacketRegistry.getPacketType(currentProtocol, packetClass);
if (type == null) {
ProtocolLogger.debug("Invalid packet type: " + packetClass.getName());
return null;
}
PacketContainer container = new PacketContainer(type, packet);
PacketEvent packetEvent = PacketEvent.fromServer(this, container, marker, injector.getPlayer());
// post to all listeners, then return the packet event we constructed