* 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
95 lines
2.0 KiB
C++
95 lines
2.0 KiB
C++
#include "stdafx.h"
|
|
#include "net.minecraft.world.level.h"
|
|
#include "net.minecraft.world.level.tile.h"
|
|
#include "MinecartSpawner.h"
|
|
|
|
MinecartSpawner::MinecartMobSpawner::MinecartMobSpawner(MinecartSpawner *parent)
|
|
{
|
|
m_parent = parent;
|
|
}
|
|
|
|
void MinecartSpawner::MinecartMobSpawner::broadcastEvent(int id)
|
|
{
|
|
m_parent->level->broadcastEntityEvent(m_parent->shared_from_this(), static_cast<byte>(id));
|
|
}
|
|
|
|
Level *MinecartSpawner::MinecartMobSpawner::getLevel()
|
|
{
|
|
return m_parent->level;
|
|
}
|
|
|
|
int MinecartSpawner::MinecartMobSpawner::getX()
|
|
{
|
|
return Mth::floor(m_parent->x);
|
|
}
|
|
|
|
int MinecartSpawner::MinecartMobSpawner::getY()
|
|
{
|
|
return Mth::floor(m_parent->y);
|
|
}
|
|
|
|
int MinecartSpawner::MinecartMobSpawner::getZ()
|
|
{
|
|
return Mth::floor(m_parent->z);
|
|
}
|
|
|
|
MinecartSpawner::MinecartSpawner(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();
|
|
|
|
spawner = new MinecartMobSpawner(this);
|
|
}
|
|
|
|
MinecartSpawner::MinecartSpawner(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();
|
|
|
|
spawner = new MinecartMobSpawner(this);
|
|
}
|
|
|
|
MinecartSpawner::~MinecartSpawner()
|
|
{
|
|
delete spawner;
|
|
}
|
|
|
|
int MinecartSpawner::getType()
|
|
{
|
|
return TYPE_SPAWNER;
|
|
}
|
|
|
|
Tile *MinecartSpawner::getDefaultDisplayTile()
|
|
{
|
|
return Tile::mobSpawner;
|
|
}
|
|
|
|
void MinecartSpawner::readAdditionalSaveData(CompoundTag *tag)
|
|
{
|
|
Minecart::readAdditionalSaveData(tag);
|
|
spawner->load(tag);
|
|
}
|
|
|
|
void MinecartSpawner::addAdditonalSaveData(CompoundTag *tag)
|
|
{
|
|
Minecart::addAdditonalSaveData(tag);
|
|
spawner->save(tag);
|
|
}
|
|
|
|
void MinecartSpawner::handleEntityEvent(byte eventId)
|
|
{
|
|
spawner->onEventTriggered(eventId);
|
|
}
|
|
|
|
void MinecartSpawner::tick()
|
|
{
|
|
Minecart::tick();
|
|
spawner->tick();
|
|
}
|
|
|
|
BaseMobSpawner *MinecartSpawner::getSpawner()
|
|
{
|
|
return spawner;
|
|
} |