mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-14 23:45:34 +00:00
Code Issues Projects Releases Wiki Activity

Added login packet protection

Browse Source
This commit is contained in:
Shoghi Cervantes Pueyo 2013-04-12 13:59:21 +02:00
parent c45cd5e12a
commit 83a63ef805
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/Player.php
View File

@ -792,21 +792,23 @@ class Player{
} }
break; break;
case MC_MOVE_PLAYER: case MC_MOVE_PLAYER:
if($this->loggedIn === false){ if($this->spawned === false){
break; break;
} }
if(($this->entity instanceof Entity) and $data["counter"] > $this->lastMovement){ if(($this->entity instanceof Entity) and $data["counter"] > $this->lastMovement){
$this->lastMovement = $data["counter"]; $this->lastMovement = $data["counter"];
$speed = $this->entity->getSpeed(); $speed = $this->entity->getSpeed();
if($this->blocked === true or ($speed > 5 and $this->gamemode !== CREATIVE) or $speed > 12 or $this->server->api->handle("player.move", $this->entity) === false){ if($this->blocked === true or ($speed > 5 and $this->gamemode !== CREATIVE) or $speed > 12 or $this->server->api->handle("player.move", $this->entity) === false){
$this->teleport($this->lastCorrect, $this->entity->yaw, $this->entity->pitch, false); if($this->lastCorrect instanceof Vector3){
$this->teleport($this->lastCorrect, $this->entity->yaw, $this->entity->pitch, false);
}
}else{ }else{
$this->entity->setPosition($data["x"], $data["y"], $data["z"], $data["yaw"], $data["pitch"]); $this->entity->setPosition($data["x"], $data["y"], $data["z"], $data["yaw"], $data["pitch"]);
} }
} }
break; break;
case MC_PLAYER_EQUIPMENT: case MC_PLAYER_EQUIPMENT:
if($this->loggedIn === false){ if($this->spawned === false){
break; break;
} }
$data["eid"] = $this->eid; $data["eid"] = $this->eid;
@ -817,12 +819,12 @@ class Player{
} }
break; break;
case MC_REQUEST_CHUNK: case MC_REQUEST_CHUNK:
if($this->loggedIn === false){ if($this->spawned === false){
break; break;
} }
break; break;
case MC_USE_ITEM: case MC_USE_ITEM:
if($this->loggedIn === false){ if($this->spawned === false){
break; break;
} }
$data["eid"] = $this->eid; $data["eid"] = $this->eid;
@ -835,7 +837,7 @@ class Player{
$this->server->api->block->playerBlockAction($this, new Vector3($data["x"], $data["y"], $data["z"]), $data["face"], $data["fx"], $data["fy"], $data["fz"]); $this->server->api->block->playerBlockAction($this, new Vector3($data["x"], $data["y"], $data["z"]), $data["face"], $data["fx"], $data["fy"], $data["fz"]);
break; break;
case MC_REMOVE_BLOCK: case MC_REMOVE_BLOCK:
if($this->loggedIn === false){ if($this->spawned === false){
break; break;
} }
if($this->blocked === true or Utils::distance($this->entity->position, $data) > 8){ if($this->blocked === true or Utils::distance($this->entity->position, $data) > 8){
@ -844,14 +846,14 @@ class Player{
$this->server->api->block->playerBlockBreak($this, new Vector3($data["x"], $data["y"], $data["z"])); $this->server->api->block->playerBlockBreak($this, new Vector3($data["x"], $data["y"], $data["z"]));
break; break;
case MC_PLAYER_ARMOR_EQUIPMENT: case MC_PLAYER_ARMOR_EQUIPMENT:
if($this->loggedIn === false){ if($this->spawned === false){
break; break;
} }
$data["eid"] = $this->eid; $data["eid"] = $this->eid;
$this->server->handle("player.armor", $data); $this->server->handle("player.armor", $data);
break; break;
case MC_INTERACT: case MC_INTERACT:
if($this->loggedIn === false){ if($this->spawned === false){
break; break;
} }
if($this->blocked === false and isset($this->server->entities[$data["target"]]) and Utils::distance($this->entity->position, $this->server->entities[$data["target"]]->position) <= 8){ if($this->blocked === false and isset($this->server->entities[$data["target"]]) and Utils::distance($this->entity->position, $this->server->entities[$data["target"]]->position) <= 8){
@ -928,13 +930,13 @@ class Player{
} }
break; break;
case MC_ANIMATE: case MC_ANIMATE:
if($this->loggedIn === false){ if($this->spawned === false){
break; break;
} }
$this->server->api->dhandle("entity.animate", array("eid" => $this->eid, "action" => $data["action"])); $this->server->api->dhandle("entity.animate", array("eid" => $this->eid, "action" => $data["action"]));
break; break;
case MC_RESPAWN: case MC_RESPAWN:
if($this->loggedIn === false){ if($this->spawned === false){
break; break;
} }
if($this->entity->dead === false){ if($this->entity->dead === false){
@ -948,7 +950,7 @@ class Player{
$this->teleport(new Vector3($this->server->spawn["x"], $this->server->spawn["y"], $this->server->spawn["z"])); $this->teleport(new Vector3($this->server->spawn["x"], $this->server->spawn["y"], $this->server->spawn["z"]));
break; break;
case MC_SET_HEALTH: case MC_SET_HEALTH:
if($this->loggedIn === false){ if($this->spawned === false){
break; break;
} }
if($this->gamemode === CREATIVE){ if($this->gamemode === CREATIVE){
@ -957,7 +959,7 @@ class Player{
//$this->entity->setHealth($data["health"], "client"); //$this->entity->setHealth($data["health"], "client");
break; break;
case MC_ENTITY_EVENT: case MC_ENTITY_EVENT:
if($this->loggedIn === false){ if($this->spawned === false){
break; break;
} }
$data["eid"] = $this->eid; $data["eid"] = $this->eid;
@ -984,7 +986,7 @@ class Player{
} }
break; break;
case MC_DROP_ITEM: case MC_DROP_ITEM:
if($this->loggedIn === false){ if($this->spawned === false){
break; break;
} }
$item = BlockAPI::getItem($data["block"], $data["meta"], $data["stack"]); $item = BlockAPI::getItem($data["block"], $data["meta"], $data["stack"]);
@ -995,7 +997,7 @@ class Player{
} }
break; break;
case MC_SIGN_UPDATE: case MC_SIGN_UPDATE:
if($this->loggedIn === false){ if($this->spawned === false){
break; break;
} }
$t = $this->server->api->tileentity->get($data["x"], $data["y"], $data["z"]); $t = $this->server->api->tileentity->get($data["x"], $data["y"], $data["z"]);
@ -1014,7 +1016,7 @@ class Player{
} }
break; break;
case MC_CHAT: case MC_CHAT:
if($this->loggedIn === false){ if($this->spawned === false){
break; break;
} }
$message = $data["message"]; $message = $data["message"];
@ -1027,12 +1029,18 @@ class Player{
} }
break; break;
case MC_CONTAINER_CLOSE: case MC_CONTAINER_CLOSE:
if($this->spawned === false){
break;
}
unset($this->windows[$data["windowid"]]); unset($this->windows[$data["windowid"]]);
$this->dataPacket(MC_CONTAINER_CLOSE, array( $this->dataPacket(MC_CONTAINER_CLOSE, array(
"windowid" => $id, "windowid" => $id,
)); ));
break; break;
case MC_CONTAINER_SET_SLOT: case MC_CONTAINER_SET_SLOT:
if($this->spawned === false){
break;
}
if(!isset($this->windows[$data["windowid"]])){ if(!isset($this->windows[$data["windowid"]])){
break; break;
} }
@ -1073,7 +1081,10 @@ class Player{
} }
$tile->setSlot($data["slot"], $item); $tile->setSlot($data["slot"], $item);
break; break;
case MC_SEND_INVENTORY: //TODO, Mojang, enable this <20>^_^` case MC_SEND_INVENTORY: //TODO, Mojang, enable this ´^_^`
if($this->spawned === false){
break;
}
break; break;
default: default:
console("[DEBUG] Unhandled 0x".dechex($data["id"])." Data Packet for Client ID ".$this->clientID.": ".print_r($data, true), true, true, 2); console("[DEBUG] Unhandled 0x".dechex($data["id"])." Data Packet for Client ID ".$this->clientID.": ".print_r($data, true), true, true, 2);