a9be52c41a
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides
39 lines
1.1 KiB
C++
39 lines
1.1 KiB
C++
#include "stdafx.h"
|
|
#include "net.minecraft.world.entity.h"
|
|
#include "net.minecraft.world.entity.player.h"
|
|
#include "net.minecraft.world.level.h"
|
|
#include "MinecartRideable.h"
|
|
|
|
|
|
MinecartRideable::MinecartRideable(Level *level) : Minecart(level)
|
|
{
|
|
|
|
// 4J Stu - This function call had to be moved here from the Entity ctor to ensure that
|
|
// the derived version of the function is called
|
|
this->defineSynchedData();
|
|
}
|
|
|
|
MinecartRideable::MinecartRideable(Level *level, double x, double y, double z) : Minecart(level, x, y, z)
|
|
{
|
|
|
|
// 4J Stu - This function call had to be moved here from the Entity ctor to ensure that
|
|
// the derived version of the function is called
|
|
this->defineSynchedData();
|
|
}
|
|
|
|
bool MinecartRideable::interact(shared_ptr<Player> player)
|
|
{
|
|
if (rider.lock() != nullptr && rider.lock()->instanceof(eTYPE_PLAYER) && rider.lock() != player) return true;
|
|
if (rider.lock() != nullptr && rider.lock() != player) return false;
|
|
if (!level->isClientSide)
|
|
{
|
|
player->ride(shared_from_this());
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
int MinecartRideable::getType()
|
|
{
|
|
return TYPE_RIDEABLE;
|
|
} |