summaryrefslogtreecommitdiffstats
path: root/src/WorldStorage
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@outlook.com>2020-08-04 20:02:15 +0200
committerTiger Wang <ziwei.tiger@outlook.com>2020-08-05 09:35:36 +0200
commit5ed4222dee07aa8c5a967e5f95887d6bd3834454 (patch)
tree83bd2daf5a68338a54f5d14546c9e15de80e4cf4 /src/WorldStorage
parentfixup! Disable LTO on Android (diff)
downloadcuberite-5ed4222dee07aa8c5a967e5f95887d6bd3834454.tar
cuberite-5ed4222dee07aa8c5a967e5f95887d6bd3834454.tar.gz
cuberite-5ed4222dee07aa8c5a967e5f95887d6bd3834454.tar.bz2
cuberite-5ed4222dee07aa8c5a967e5f95887d6bd3834454.tar.lz
cuberite-5ed4222dee07aa8c5a967e5f95887d6bd3834454.tar.xz
cuberite-5ed4222dee07aa8c5a967e5f95887d6bd3834454.tar.zst
cuberite-5ed4222dee07aa8c5a967e5f95887d6bd3834454.zip
Diffstat (limited to 'src/WorldStorage')
-rwxr-xr-xsrc/WorldStorage/WSSAnvil.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp
index a77f10ae7..5e4d48eeb 100755
--- a/src/WorldStorage/WSSAnvil.cpp
+++ b/src/WorldStorage/WSSAnvil.cpp
@@ -927,7 +927,7 @@ OwnedBlockEntity cWSSAnvil::LoadBeaconFromNBT(const cParsedNBT & a_NBT, int a_Ta
LoadItemGridFromNBT(Beacon->GetContents(), a_NBT, Items);
}
- return std::move(Beacon);
+ return Beacon;
}
@@ -1010,7 +1010,7 @@ OwnedBlockEntity cWSSAnvil::LoadBrewingstandFromNBT(const cParsedNBT & a_NBT, in
// Restart brewing:
Brewingstand->LoadRecipes();
Brewingstand->ContinueBrewing();
- return std::move(Brewingstand);
+ return Brewingstand;
}
@@ -1034,7 +1034,7 @@ OwnedBlockEntity cWSSAnvil::LoadChestFromNBT(const cParsedNBT & a_NBT, int a_Tag
}
auto Chest = std::make_unique<cChestEntity>(a_BlockType, a_BlockMeta, a_Pos, m_World);
LoadItemGridFromNBT(Chest->GetContents(), a_NBT, Items);
- return std::move(Chest);
+ return Chest;
}
@@ -1072,7 +1072,7 @@ OwnedBlockEntity cWSSAnvil::LoadCommandBlockFromNBT(const cParsedNBT & a_NBT, in
// TODO 2014-01-18 xdot: Figure out what TrackOutput is and parse it.
- return std::move(CmdBlock);
+ return CmdBlock;
}
@@ -1095,7 +1095,7 @@ OwnedBlockEntity cWSSAnvil::LoadDispenserFromNBT(const cParsedNBT & a_NBT, int a
}
auto Dispenser = std::make_unique<cDispenserEntity>(a_BlockType, a_BlockMeta, a_Pos, m_World);
LoadItemGridFromNBT(Dispenser->GetContents(), a_NBT, Items);
- return std::move(Dispenser);
+ return Dispenser;
}
@@ -1118,7 +1118,7 @@ OwnedBlockEntity cWSSAnvil::LoadDropperFromNBT(const cParsedNBT & a_NBT, int a_T
}
auto Dropper = std::make_unique<cDropperEntity>(a_BlockType, a_BlockMeta, a_Pos, m_World);
LoadItemGridFromNBT(Dropper->GetContents(), a_NBT, Items);
- return std::move(Dropper);
+ return Dropper;
}
@@ -1157,7 +1157,7 @@ OwnedBlockEntity cWSSAnvil::LoadFlowerPotFromNBT(const cParsedNBT & a_NBT, int a
}
FlowerPot->SetItem(Item);
- return std::move(FlowerPot);
+ return FlowerPot;
}
@@ -1217,7 +1217,7 @@ OwnedBlockEntity cWSSAnvil::LoadFurnaceFromNBT(const cParsedNBT & a_NBT, int a_T
// Restart cooking:
Furnace->ContinueCooking();
Furnace->SetLoading(false);
- return std::move(Furnace);
+ return Furnace;
}
@@ -1240,7 +1240,7 @@ OwnedBlockEntity cWSSAnvil::LoadHopperFromNBT(const cParsedNBT & a_NBT, int a_Ta
}
auto Hopper = std::make_unique<cHopperEntity>(a_BlockType, a_BlockMeta, a_Pos, m_World);
LoadItemGridFromNBT(Hopper->GetContents(), a_NBT, Items);
- return std::move(Hopper);
+ return Hopper;
}
@@ -1262,7 +1262,7 @@ OwnedBlockEntity cWSSAnvil::LoadJukeboxFromNBT(const cParsedNBT & a_NBT, int a_T
{
Jukebox->SetRecord(a_NBT.GetInt(Record));
}
- return std::move(Jukebox);
+ return Jukebox;
}
@@ -1311,7 +1311,7 @@ OwnedBlockEntity cWSSAnvil::LoadMobSpawnerFromNBT(const cParsedNBT & a_NBT, int
MobSpawner->SetSpawnDelay(a_NBT.GetShort(Delay));
}
- return std::move(MobSpawner);
+ return MobSpawner;
}
@@ -1385,7 +1385,7 @@ OwnedBlockEntity cWSSAnvil::LoadMobHeadFromNBT(const cParsedNBT & a_NBT, int a_T
MobHead->SetOwner(OwnerUUID, OwnerName, OwnerTexture, OwnerTextureSignature);
}
- return std::move(MobHead);
+ return MobHead;
}
@@ -1407,7 +1407,7 @@ OwnedBlockEntity cWSSAnvil::LoadNoteBlockFromNBT(const cParsedNBT & a_NBT, int a
{
NoteBlock->SetPitch(static_cast<char>(a_NBT.GetByte(note)));
}
- return std::move(NoteBlock);
+ return NoteBlock;
}
@@ -1449,7 +1449,7 @@ OwnedBlockEntity cWSSAnvil::LoadSignFromNBT(const cParsedNBT & a_NBT, int a_TagI
Sign->SetLine(3, DecodeSignLine(a_NBT.GetString(currentLine)));
}
- return std::move(Sign);
+ return Sign;
}