Skip to content

Beginning PHP7 and 0.14.3 support. #51

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

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

Beginning PHP7 and 0.14.3 support. #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c9691a
Update BigBrother.php
MasterlazorX Jun 1, 2016
89d3a18
Update and rename Translator_20.php to Translator_70.php
MasterlazorX Jun 1, 2016
e30e7d9
Update ServerThread.php
MasterlazorX Jun 1, 2016
c279aa5
Merge pull request #1 from MasterlazorX/MasterlazorX-php7
MasterlazorX Jun 1, 2016
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
6 changes: 3 additions & 3 deletions src/shoghicp/BigBrother/BigBrother.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
use shoghicp\BigBrother\network\Info as MCInfo;
use shoghicp\BigBrother\network\ProtocolInterface;
use shoghicp\BigBrother\network\ServerThread;
use shoghicp\BigBrother\network\translation\Translator_20;
use shoghicp\BigBrother\network\translation\Translator_70;
use shoghicp\BigBrother\tasks\GeneratePrivateKey;

class BigBrother extends PluginBase implements Listener{
Expand Down Expand Up @@ -78,8 +78,8 @@ public function onEnable(){
$this->getLogger()->warning("No motd has been set. The server description will be empty.");
}

if(Info::CURRENT_PROTOCOL === 20){
$this->translator = new Translator_20();
if(Info::CURRENT_PROTOCOL === 70){
$this->translator = new Translator_70();
}else{
$this->getLogger()->critical("Couldn't find a protocol translator for #".Info::CURRENT_PROTOCOL .", disabling plugin");
$this->getPluginLoader()->disablePlugin($this);
Expand Down
4 changes: 2 additions & 2 deletions src/shoghicp/BigBrother/network/ServerThread.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ class ServerThread extends Thread{
/** @var \ThreadedLogger */
protected $logger;
protected $loader;
protected $data = [];
protected $data;

public $loadPaths = [];
public $loadPaths;

protected $shutdown;

Expand Down
4 changes: 2 additions & 2 deletions ...her/network/translation/Translator_20.php → ...her/network/translation/Translator_70.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
use shoghicp\BigBrother\network\protocol\WindowItemsPacket;
use shoghicp\BigBrother\utils\Binary;

class Translator_20 implements Translator{
class Translator_70 implements Translator{



Expand Down Expand Up @@ -401,4 +401,4 @@ public function serverToInterface(DesktopPlayer $player, DataPacket $packet){
return null;
}
}
}
}