Delete redundant std::move in World loader
This commit is contained in:
parent
7cd6f0e01e
commit
5ed4222dee
@ -927,7 +927,7 @@ OwnedBlockEntity cWSSAnvil::LoadBeaconFromNBT(const cParsedNBT & a_NBT, int a_Ta
|
|||||||
LoadItemGridFromNBT(Beacon->GetContents(), a_NBT, Items);
|
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:
|
// Restart brewing:
|
||||||
Brewingstand->LoadRecipes();
|
Brewingstand->LoadRecipes();
|
||||||
Brewingstand->ContinueBrewing();
|
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);
|
auto Chest = std::make_unique<cChestEntity>(a_BlockType, a_BlockMeta, a_Pos, m_World);
|
||||||
LoadItemGridFromNBT(Chest->GetContents(), a_NBT, Items);
|
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.
|
// 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);
|
auto Dispenser = std::make_unique<cDispenserEntity>(a_BlockType, a_BlockMeta, a_Pos, m_World);
|
||||||
LoadItemGridFromNBT(Dispenser->GetContents(), a_NBT, Items);
|
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);
|
auto Dropper = std::make_unique<cDropperEntity>(a_BlockType, a_BlockMeta, a_Pos, m_World);
|
||||||
LoadItemGridFromNBT(Dropper->GetContents(), a_NBT, Items);
|
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);
|
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:
|
// Restart cooking:
|
||||||
Furnace->ContinueCooking();
|
Furnace->ContinueCooking();
|
||||||
Furnace->SetLoading(false);
|
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);
|
auto Hopper = std::make_unique<cHopperEntity>(a_BlockType, a_BlockMeta, a_Pos, m_World);
|
||||||
LoadItemGridFromNBT(Hopper->GetContents(), a_NBT, Items);
|
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));
|
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));
|
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);
|
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)));
|
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)));
|
Sign->SetLine(3, DecodeSignLine(a_NBT.GetString(currentLine)));
|
||||||
}
|
}
|
||||||
|
|
||||||
return std::move(Sign);
|
return Sign;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user