mirror of
https://github.com/oldminecraftcommunity/NostalgiaCore.git
synced 2026-11-21 12:09:43 +00:00
removed ProtocolInfo::EID_PACKETS, added ability to customize min block breaking progress required to destroy a block + change value from 1 to 0.8
This commit is contained in:
parent
a62986a8d6
commit
5537f3e197
4 changed files with 18 additions and 49 deletions
|
|
@ -413,7 +413,7 @@ class BlockAPI{
|
|||
$exceptedTimeMS = INF;
|
||||
$tooFast = true;
|
||||
}else{
|
||||
$exceptedTimeMS = ceil(1 / $progress)*0.05;
|
||||
$exceptedTimeMS = ceil(PocketMinecraftServer::$BLOCK_BREAKING_PROGRESS / $progress)*0.05;
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -433,7 +433,7 @@ class Player{
|
|||
public function directDataPacket(RakNetDataPacket $packet, $reliability = 0, $recover = true){
|
||||
if($this->connected === false) return false;
|
||||
if(EventHandler::callEvent(new DataPacketSendEvent($this, $packet)) === BaseEvent::DENY) return [];
|
||||
if(isset(ProtocolInfo::EID_PACKETS[$packet->pid()])) if(!$this->convertToLocalEIDPacket($packet)) return false;
|
||||
if(!$this->convertToLocalEIDPacket($packet)) return false;
|
||||
|
||||
$packet->encode();
|
||||
$pk = new RakNetPacket(RakNetInfo::DATA_PACKET_0);
|
||||
|
|
@ -455,7 +455,7 @@ class Player{
|
|||
public function dataPacket(RakNetDataPacket $packet){
|
||||
if($this->connected === false) return false;
|
||||
if(EventHandler::callEvent(new DataPacketSendEvent($this, $packet)) === BaseEvent::DENY) return;
|
||||
if(isset(ProtocolInfo::EID_PACKETS[$packet->pid()])) if(!$this->convertToLocalEIDPacket($packet)) return false;
|
||||
if(!$this->convertToLocalEIDPacket($packet)) return false;
|
||||
|
||||
$packet->encode();
|
||||
$len = strlen($packet->buffer) + 1;
|
||||
|
|
@ -482,7 +482,7 @@ class Player{
|
|||
public function dataPacketAlwaysRecover(RakNetDataPacket $packet){
|
||||
if($this->connected === false) return false;
|
||||
if(EventHandler::callEvent(new DataPacketSendEvent($this, $packet)) === BaseEvent::DENY) return false;
|
||||
if(isset(ProtocolInfo::EID_PACKETS[$packet->pid()])) if(!$this->convertToLocalEIDPacket($packet)) return false;
|
||||
if(!$this->convertToLocalEIDPacket($packet)) return false;
|
||||
|
||||
$pk = new RakNetPacket(RakNetInfo::DATA_PACKET_0);
|
||||
$pk->data[] = $packet;
|
||||
|
|
@ -619,7 +619,6 @@ class Player{
|
|||
public function sendBigPacketAlwaysRecover(RakNetDataPacket $pk){
|
||||
if($this->connected === false) return false;
|
||||
if(EventHandler::callEvent(new DataPacketSendEvent($this, $pk)) === BaseEvent::DENY) return;
|
||||
if(isset(ProtocolInfo::EID_PACKETS[$pk->pid()])) if(!$this->convertToLocalEIDPacket($pk)) return false;
|
||||
|
||||
$pk->encode();
|
||||
$sendtime = microtime(true);
|
||||
|
|
@ -1689,7 +1688,7 @@ class Player{
|
|||
public function blockQueueDataPacket(RakNetDataPacket $pk){
|
||||
if($this->connected === false) return false;
|
||||
if(EventHandler::callEvent(new DataPacketSendEvent($this, $pk)) === BaseEvent::DENY) return;
|
||||
if(isset(ProtocolInfo::EID_PACKETS[$pk->pid()])) if(!$this->convertToLocalEIDPacket($pk)) return false;
|
||||
if(!$this->convertToLocalEIDPacket($pk)) return false;
|
||||
|
||||
$pk->encode();
|
||||
|
||||
|
|
@ -1709,24 +1708,17 @@ class Player{
|
|||
}
|
||||
|
||||
public function convertToGlobalEIDPacket(RakNetDataPacket $pk){
|
||||
if($pk->pid() == ProtocolInfo::INTERACT_PACKET){
|
||||
$eid = $pk->eid;
|
||||
$target = $pk->target;
|
||||
}
|
||||
if(!$pk->eidsToGlobal($this)){
|
||||
ConsoleAPI::warn("Failed to convert eids to global in {$pk->pid()}! (Player: {$this->ip}:{$this->port}). Stacktrace: ");
|
||||
if($pk->pid() == ProtocolInfo::INTERACT_PACKET){
|
||||
ConsoleAPI::warn("EID: $eid Target: $target");
|
||||
}
|
||||
foreach(explode("\n", (new Exception())->getTraceAsString()) as $s) ConsoleAPI::warn($s);
|
||||
//ConsoleAPI::warn("Failed to convert eids to global in {$pk->pid()}! (Player: {$this->ip}:{$this->port}). Stacktrace: ");
|
||||
//foreach(explode("\n", (new Exception())->getTraceAsString()) as $s) ConsoleAPI::warn($s);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
public function convertToLocalEIDPacket(RakNetDataPacket $pk){
|
||||
if(!$pk->eidsToLocal($this)){
|
||||
ConsoleAPI::debug("Failed to convert eids to local in {$pk->pid()}! (Player: {$this->ip}:{$this->port}). Stacktrace: ");
|
||||
foreach(explode("\n", (new Exception())->getTraceAsString()) as $s) ConsoleAPI::debug($s);
|
||||
//ConsoleAPI::debug("Failed to convert eids to local in {$pk->pid()}! (Player: {$this->ip}:{$this->port}). Stacktrace: ");
|
||||
//foreach(explode("\n", (new Exception())->getTraceAsString()) as $s) ConsoleAPI::debug($s);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
|
@ -1740,7 +1732,7 @@ class Player{
|
|||
public function entityQueueDataPacket(RakNetDataPacket $pk){
|
||||
if($this->connected === false) return false;
|
||||
if(EventHandler::callEvent(new DataPacketSendEvent($this, $pk)) === BaseEvent::DENY) return;
|
||||
if(isset(ProtocolInfo::EID_PACKETS[$pk->pid()])) if(!$this->convertToLocalEIDPacket($pk)) return false;
|
||||
if(!$this->convertToLocalEIDPacket($pk)) return false;
|
||||
$pk->encode();
|
||||
|
||||
$len = 1 + strlen($pk->buffer);
|
||||
|
|
@ -1984,7 +1976,7 @@ class Player{
|
|||
public function sendChatMessagePacket(RakNetDataPacket $packet){
|
||||
if($this->connected === false) return false;
|
||||
if(EventHandler::callEvent(new DataPacketSendEvent($this, $packet)) === BaseEvent::DENY) return false;
|
||||
if(isset(ProtocolInfo::EID_PACKETS[$packet->pid()])) if(!$this->convertToLocalEIDPacket($packet)) return false;
|
||||
if(!$this->convertToLocalEIDPacket($packet)) return false;
|
||||
|
||||
$packet->encode();
|
||||
$len = strlen($packet->buffer) + 1;
|
||||
|
|
@ -2036,7 +2028,7 @@ class Player{
|
|||
if($this->connected === false){
|
||||
return;
|
||||
}
|
||||
if(isset(ProtocolInfo::EID_PACKETS[$packet->pid()])) if(!$this->convertToGlobalEIDPacket($packet)) return;
|
||||
if(!$this->convertToGlobalEIDPacket($packet)) return;
|
||||
|
||||
if(EventHandler::callEvent(new DataPacketReceiveEvent($this, $packet)) === BaseEvent::DENY){
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ class PocketMinecraftServer{
|
|||
|
||||
public $doTick, $levelData, $tiles, $entities, $schedule, $scheduleCnt, $whitelist, $spawn, $difficulty, $stop, $asyncThread;
|
||||
public static $FORCE_20_TPS = false, $KEEP_CHUNKS_LOADED = true, $PACKET_READING_LIMIT = 100;
|
||||
public static $BLOCK_BREAKING_PROGRESS = 0.8;
|
||||
public static $ENABLE_LIGHT_UPDATES = true;
|
||||
function __construct($name, $gamemode = SURVIVAL, $seed = false, $port = 19132, $serverip = "0.0.0.0"){
|
||||
$this->port = (int) $port;
|
||||
|
|
@ -104,7 +105,9 @@ class PocketMinecraftServer{
|
|||
"disable-emojis-on-signs" => Level::$disableEmojisOnSigns,
|
||||
"allow-dropping-single-items" => Player::$allowDroppingSingleItems,
|
||||
"enable-light-updates" => self::$ENABLE_LIGHT_UPDATES,
|
||||
"min-block-breaking-progress" => self::$BLOCK_BREAKING_PROGRESS,
|
||||
]);
|
||||
self::$BLOCK_BREAKING_PROGRESS = $this->extraprops->get("min-block-breaking-progress");
|
||||
Player::$disableEmojisInChat = $this->extraprops->get("disable-emojis-in-chat");
|
||||
Level::$disableEmojisOnSigns = $this->extraprops->get("disable-emojis-on-signs");
|
||||
Entity::$keepInventory = $this->extraprops->get("keep-items-on-death");
|
||||
|
|
@ -123,6 +126,9 @@ class PocketMinecraftServer{
|
|||
if(self::$FORCE_20_TPS){
|
||||
ConsoleAPI::warn("Forcing 20 tps. This may result in higher CPU usage!");
|
||||
}
|
||||
if(self::$BLOCK_BREAKING_PROGRESS > 1){
|
||||
ConsoleAPI::warn("Minimal block breaking progress is more than 1, may cause ghost blocks to appear even for players with extremely low ping!");
|
||||
}
|
||||
if(!self::$ENABLE_LIGHT_UPDATES){
|
||||
ConsoleAPI::warn("Light updates are disabled: this should decrease memory consumption and increase performance, but will prevent all existing light from updating and disable some light-dependant features.");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -70,35 +70,6 @@ abstract class ProtocolInfo{
|
|||
const ADVENTURE_SETTINGS_PACKET = 0xb7;
|
||||
const ENTITY_DATA_PACKET = 0xb8;
|
||||
const PLAYER_INPUT_PACKET = 0xb9;
|
||||
|
||||
const EID_PACKETS = [
|
||||
self::ADD_MOB_PACKET => true,
|
||||
self::ADD_ITEM_ENTITY_PACKET => true,
|
||||
self::RESPAWN_PACKET => true,
|
||||
self::SET_ENTITY_MOTION_PACKET => true,
|
||||
self::USE_ITEM_PACKET => true,
|
||||
self::SET_ENTITY_DATA_PACKET => true,
|
||||
self::PLAYER_ARMOR_EQUIPMENT_PACKET => true,
|
||||
self::ROTATE_HEAD_PACKET => true,
|
||||
self::PLAYER_EQUIPMENT_PACKET => true,
|
||||
self::SEND_INVENTORY_PACKET => true,
|
||||
self::INTERACT_PACKET => true,
|
||||
self::ENTITY_EVENT_PACKET => true,
|
||||
self::PLAYER_ACTION_PACKET => true,
|
||||
self::REMOVE_ENTITY_PACKET => true,
|
||||
self::ANIMATE_PACKET => true,
|
||||
self::ADD_PLAYER_PACKET => true,
|
||||
self::TAKE_ITEM_ENTITY_PACKET => true,
|
||||
self::START_GAME_PACKET => true,
|
||||
self::ADD_PAINTING_PACKET => true,
|
||||
self::REMOVE_PLAYER_PACKET => true,
|
||||
self::MOVE_ENTITY_PACKET_POSROT => true,
|
||||
self::ADD_ENTITY_PACKET => true,
|
||||
self::REMOVE_BLOCK_PACKET => true,
|
||||
self::MOVE_PLAYER_PACKET => true,
|
||||
self::DROP_ITEM_PACKET => true,
|
||||
self::SET_ENTITY_LINK_PACKET => true
|
||||
];
|
||||
}
|
||||
/*Unused:
|
||||
* 0xb5
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue