Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clean up AbstractPacket #57

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Clean up AbstractPacket #57

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ecd084
Remove old deprecated "recievePacket" method.
Photon-GitHub Sep 27, 2018
222d78c
Use Preconditions instead of throwing the exceptions manually.
Photon-GitHub Sep 27, 2018
9d3d742
Improve formatting
Photon-GitHub Sep 27, 2018
59a7600
Correct the intendation.
Photon-GitHub Oct 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 5 additions & 28 deletions PacketWrapper/src/main/java/com/comphenix/packetwrapper/AbstractPacket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import java.lang.reflect.InvocationTargetException;

import com.google.common.base.Preconditions;
import org.bukkit.entity.Player;

import com.comphenix.protocol.PacketType;
Expand All @@ -39,12 +40,8 @@ public abstract class AbstractPacket {
*/
protected AbstractPacket(PacketContainer handle, PacketType type) {
// Make sure we're given a valid packet
if (handle == null)
throw new IllegalArgumentException("Packet handle cannot be NULL.");
if (!Objects.equal(handle.getType(), type))
throw new IllegalArgumentException(handle.getHandle()
+ " is not a packet of type " + type);

Preconditions.checkNotNull(handle, "Packet handle cannot be NULL.");
Preconditions.checkArgument(Objects.equal(handle.getType(), type), handle.getHandle() + " is not a packet of type " + type);
Photon-GitHub marked this conversation as resolved.
Show resolved Hide resolved
this.handle = handle;
}

Expand All @@ -65,8 +62,7 @@ public PacketContainer getHandle() {
*/
public void sendPacket(Player receiver) {
try {
ProtocolLibrary.getProtocolManager().sendServerPacket(receiver,
getHandle());
ProtocolLibrary.getProtocolManager().sendServerPacket(receiver, getHandle());
} catch (InvocationTargetException e) {
throw new RuntimeException("Cannot send packet.", e);
}
Expand All @@ -79,24 +75,6 @@ public void broadcastPacket() {
ProtocolLibrary.getProtocolManager().broadcastServerPacket(getHandle());
}

/**
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to here.

* Simulate receiving the current packet from the given sender.
*
* @param sender - the sender.
* @throws RuntimeException If the packet cannot be received.
* @deprecated Misspelled. recieve to receive
* @see #receivePacket(Player)
*/
@Deprecated
public void recievePacket(Player sender) {
try {
ProtocolLibrary.getProtocolManager().recieveClientPacket(sender,
getHandle());
} catch (Exception e) {
throw new RuntimeException("Cannot recieve packet.", e);
}
}

/**
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

from here

* Simulate receiving the current packet from the given sender.
*
Expand All @@ -105,8 +83,7 @@ public void recievePacket(Player sender) {
*/
public void receivePacket(Player sender) {
try {
ProtocolLibrary.getProtocolManager().recieveClientPacket(sender,
getHandle());
ProtocolLibrary.getProtocolManager().recieveClientPacket(sender, getHandle());
} catch (Exception e) {
throw new RuntimeException("Cannot receive packet.", e);
}
Expand Down