aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/TripWireTile.cpp
diff options
context:
space:
mode:
authorvoid_17 <heroerror3@gmail.com>2026-03-02 17:37:16 +0700
committervoid_17 <heroerror3@gmail.com>2026-03-02 17:37:16 +0700
commit119bff351450ea16ffda550b6e0f67379b29f708 (patch)
treed9f28714afd516bc2450f33b0a77c5e05ff4de90 /Minecraft.World/TripWireTile.cpp
parent8a2a62ea1d47364f802cf9aae97668bc4a7007b5 (diff)
Revert "shared_ptr -> std::shared_ptr"
This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5.
Diffstat (limited to 'Minecraft.World/TripWireTile.cpp')
-rw-r--r--Minecraft.World/TripWireTile.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/Minecraft.World/TripWireTile.cpp b/Minecraft.World/TripWireTile.cpp
index 92560185..40ad93f8 100644
--- a/Minecraft.World/TripWireTile.cpp
+++ b/Minecraft.World/TripWireTile.cpp
@@ -13,7 +13,7 @@ TripWireTile::TripWireTile(int id) : Tile(id, Material::decoration, isSolidRende
int TripWireTile::getTickDelay(Level *level)
{
- // 4J: Increased (x2); quick update caused problems with shared
+ // 4J: Increased (x2); quick update caused problems with shared
// data between client and server.
return 20; // 10;
}
@@ -70,7 +70,7 @@ void TripWireTile::neighborChanged(Level *level, int x, int y, int z, int type)
}
}
-void TripWireTile::updateShape(LevelSource *level, int x, int y, int z, int forceData, std::shared_ptr<TileEntity> forceEntity)
+void TripWireTile::updateShape(LevelSource *level, int x, int y, int z, int forceData, shared_ptr<TileEntity> forceEntity)
{
int data = level->getData(x, y, z);
bool attached = (data & MASK_ATTACHED) == MASK_ATTACHED;
@@ -102,7 +102,7 @@ void TripWireTile::onRemove(Level *level, int x, int y, int z, int id, int data)
updateSource(level, x, y, z, data | MASK_POWERED);
}
-void TripWireTile::playerWillDestroy(Level *level, int x, int y, int z, int data, std::shared_ptr<Player> player)
+void TripWireTile::playerWillDestroy(Level *level, int x, int y, int z, int data, shared_ptr<Player> player)
{
if (level->isClientSide) return;
@@ -141,7 +141,7 @@ void TripWireTile::updateSource(Level *level, int x, int y, int z, int data)
}
}
-void TripWireTile::entityInside(Level *level, int x, int y, int z, std::shared_ptr<Entity> entity)
+void TripWireTile::entityInside(Level *level, int x, int y, int z, shared_ptr<Entity> entity)
{
if (level->isClientSide) return;
@@ -164,9 +164,9 @@ void TripWireTile::checkPressed(Level *level, int x, int y, int z)
int data = level->getData(x, y, z);
bool wasPressed = (data & MASK_POWERED) == MASK_POWERED;
bool shouldBePressed = false;
-
+
ThreadStorage *tls = (ThreadStorage *)TlsGetValue(Tile::tlsIdxShape);
- vector<std::shared_ptr<Entity> > *entities = level->getEntities(nullptr, AABB::newTemp(x + tls->xx0, y + tls->yy0, z + tls->zz0, x + tls->xx1, y + tls->yy1, z + tls->zz1));
+ vector<shared_ptr<Entity> > *entities = level->getEntities(nullptr, AABB::newTemp(x + tls->xx0, y + tls->yy0, z + tls->zz0, x + tls->xx1, y + tls->yy1, z + tls->zz1));
if (!entities->empty())
{
shouldBePressed = true;