From a18cb3d484c0aa5d48ecf58720231c5a0e4645e5 Mon Sep 17 00:00:00 2001 From: MatthewBeshay <92357869+MatthewBeshay@users.noreply.github.com> Date: Tue, 31 Mar 2026 20:34:51 +1100 Subject: [PATCH] refactor: replace shared_ptr(new T) with make_shared --- .../Minecraft.Client/Common/Consoles_App.cpp | 10 -- .../Minecraft.Client/Common/Consoles_App.h | 1 - .../UIScene_TrialExitUpsell.cpp | 1 - .../UIScene_PauseMenu.cpp | 1 - .../Source Files/Extrax64Stubs.cpp | 1 - .../net/minecraft/client/Minecraft.cpp | 2 +- .../minecraft/client/gui/MerchantScreen.cpp | 8 +- .../net/minecraft/client/gui/RepairScreen.cpp | 4 +- .../client/gui/inventory/BeaconScreen.cpp | 8 +- .../client/multiplayer/ClientConnection.cpp | 54 +++--- .../multiplayer/MultiPlayerGameMode.cpp | 46 ++--- .../client/multiplayer/MultiPlayerLevel.cpp | 2 +- .../multiplayer/MultiPlayerLocalPlayer.cpp | 66 +++---- .../multiplayer/ReceivingLevelScreen.cpp | 2 +- .../client/particle/ParticleEngine.cpp | 4 +- .../minecraft/client/player/LocalPlayer.cpp | 4 +- .../client/renderer/EntityTileRenderer.cpp | 4 +- .../client/renderer/GameRenderer.cpp | 4 +- .../client/renderer/LevelRenderer.cpp | 18 +- .../client/renderer/entity/PlayerRenderer.cpp | 2 +- .../renderer/entity/SnowManRenderer.cpp | 2 +- .../net/minecraft/server/MinecraftServer.cpp | 8 +- .../net/minecraft/server/PlayerList.cpp | 56 +++--- .../net/minecraft/server/level/GameMode.cpp | 4 +- .../minecraft/server/level/PlayerChunkMap.cpp | 4 +- .../minecraft/server/level/ServerLevel.cpp | 10 +- .../minecraft/server/level/ServerPlayer.cpp | 162 +++++++++--------- .../minecraft/server/level/TrackedEntity.cpp | 88 +++++----- .../server/network/PendingConnection.cpp | 2 +- .../server/network/PlayerConnection.cpp | 32 ++-- .../server/network/ServerConnection.cpp | 4 +- .../commands/common/GiveItemCommand.cpp | 2 +- .../minecraft/core/ItemDispenseBehaviors.cpp | 18 +- .../net/minecraft/network/Connection.cpp | 2 +- .../network/packet/AddEntityPacket.h | 2 +- .../network/packet/AddExperienceOrbPacket.h | 2 +- .../network/packet/AddGlobalEntityPacket.h | 2 +- .../minecraft/network/packet/AddMobPacket.h | 2 +- .../network/packet/AddPaintingPacket.h | 2 +- .../network/packet/AddPlayerPacket.h | 2 +- .../minecraft/network/packet/AnimatePacket.h | 2 +- .../network/packet/AwardStatPacket.h | 2 +- .../network/packet/BlockRegionUpdatePacket.h | 2 +- .../net/minecraft/network/packet/ChatPacket.h | 2 +- .../network/packet/ChunkTilesUpdatePacket.h | 2 +- .../packet/ChunkVisibilityAreaPacket.h | 2 +- .../network/packet/ChunkVisibilityPacket.h | 2 +- .../network/packet/ClientCommandPacket.h | 2 +- .../network/packet/ComplexItemDataPacket.h | 2 +- .../network/packet/ContainerAckPacket.h | 2 +- .../packet/ContainerButtonClickPacket.h | 2 +- .../network/packet/ContainerClickPacket.h | 2 +- .../network/packet/ContainerClosePacket.h | 2 +- .../network/packet/ContainerOpenPacket.h | 2 +- .../packet/ContainerSetContentPacket.h | 2 +- .../network/packet/ContainerSetDataPacket.h | 2 +- .../network/packet/ContainerSetSlotPacket.h | 2 +- .../network/packet/CraftItemPacket.h | 2 +- .../network/packet/CustomPayloadPacket.h | 2 +- .../network/packet/DebugOptionsPacket.h | 2 +- .../network/packet/DisconnectPacket.h | 2 +- .../packet/EntityActionAtPositionPacket.h | 2 +- .../network/packet/EntityEventPacket.h | 2 +- .../minecraft/network/packet/ExplodePacket.h | 2 +- .../network/packet/GameCommandPacket.h | 2 +- .../network/packet/GameEventPacket.h | 2 +- .../minecraft/network/packet/GetInfoPacket.h | 2 +- .../minecraft/network/packet/InteractPacket.h | 2 +- .../network/packet/KeepAlivePacket.h | 2 +- .../network/packet/KickPlayerPacket.h | 2 +- .../network/packet/LevelEventPacket.h | 2 +- .../network/packet/LevelParticlesPacket.h | 2 +- .../network/packet/LevelSoundPacket.h | 2 +- .../minecraft/network/packet/LoginPacket.h | 2 +- .../network/packet/MoveEntityPacket.h | 8 +- .../network/packet/MoveEntityPacketSmall.h | 8 +- .../network/packet/MovePlayerPacket.h | 8 +- .../net/minecraft/network/packet/Packet.cpp | 2 +- .../network/packet/PlayerAbilitiesPacket.h | 2 +- .../network/packet/PlayerActionPacket.h | 2 +- .../network/packet/PlayerCommandPacket.h | 2 +- .../network/packet/PlayerInfoPacket.h | 2 +- .../network/packet/PlayerInputPacket.h | 2 +- .../minecraft/network/packet/PreLoginPacket.h | 2 +- .../network/packet/RemoveEntitiesPacket.h | 2 +- .../network/packet/RemoveMobEffectPacket.h | 2 +- .../minecraft/network/packet/RespawnPacket.h | 2 +- .../network/packet/RotateHeadPacket.h | 2 +- .../packet/ServerSettingsChangedPacket.h | 2 +- .../network/packet/SetCarriedItemPacket.h | 2 +- .../packet/SetCreativeModeSlotPacket.h | 2 +- .../packet/SetDisplayObjectivePacket.h | 2 +- .../network/packet/SetEntityDataPacket.h | 2 +- .../network/packet/SetEntityLinkPacket.h | 2 +- .../network/packet/SetEntityMotionPacket.h | 2 +- .../network/packet/SetEquippedItemPacket.h | 2 +- .../network/packet/SetExperiencePacket.h | 2 +- .../network/packet/SetHealthPacket.h | 2 +- .../network/packet/SetObjectivePacket.h | 2 +- .../network/packet/SetPlayerTeamPacket.h | 2 +- .../minecraft/network/packet/SetScorePacket.h | 2 +- .../network/packet/SetSpawnPositionPacket.h | 2 +- .../minecraft/network/packet/SetTimePacket.h | 2 +- .../network/packet/SignUpdatePacket.h | 2 +- .../network/packet/TakeItemEntityPacket.h | 2 +- .../network/packet/TeleportEntityPacket.h | 2 +- .../packet/TextureAndGeometryChangePacket.h | 2 +- .../network/packet/TextureAndGeometryPacket.h | 2 +- .../network/packet/TextureChangePacket.h | 2 +- .../minecraft/network/packet/TexturePacket.h | 2 +- .../network/packet/TileDestructionPacket.h | 2 +- .../network/packet/TileEditorOpenPacket.h | 2 +- .../network/packet/TileEntityDataPacket.h | 2 +- .../network/packet/TileEventPacket.h | 2 +- .../network/packet/TileUpdatePacket.h | 2 +- .../network/packet/TradeItemPacket.h | 2 +- .../network/packet/UpdateAttributesPacket.h | 2 +- .../packet/UpdateGameRuleProgressPacket.h | 2 +- .../network/packet/UpdateMobEffectPacket.h | 2 +- .../network/packet/UpdateProgressPacket.h | 2 +- .../minecraft/network/packet/UseItemPacket.h | 2 +- .../net/minecraft/network/packet/XZPacket.h | 2 +- .../net/minecraft/util/WeighedTreasure.cpp | 2 +- .../world/damageSource/CombatTracker.cpp | 20 +-- .../world/damageSource/DamageSource.cpp | 4 +- .../world/damageSource/EntityDamageSource.cpp | 8 +- .../IndirectEntityDamageSource.cpp | 4 +- .../net/minecraft/world/entity/Entity.cpp | 4 +- .../net/minecraft/world/entity/ItemFrame.cpp | 2 +- .../minecraft/world/entity/LivingEntity.cpp | 4 +- .../net/minecraft/world/entity/Mob.cpp | 8 +- .../net/minecraft/world/entity/Painting.cpp | 2 +- .../world/entity/SyncedEntityData.cpp | 14 +- .../world/entity/ai/goal/BreedGoal.cpp | 4 +- .../world/entity/ai/village/Village.cpp | 6 +- .../world/entity/ai/village/VillageSiege.cpp | 2 +- .../world/entity/ai/village/Villages.cpp | 4 +- .../minecraft/world/entity/animal/Chicken.cpp | 2 +- .../net/minecraft/world/entity/animal/Cow.cpp | 2 +- .../world/entity/animal/EntityHorse.cpp | 4 +- .../world/entity/animal/MushroomCow.cpp | 4 +- .../minecraft/world/entity/animal/Ocelot.cpp | 4 +- .../net/minecraft/world/entity/animal/Pig.cpp | 4 +- .../minecraft/world/entity/animal/Sheep.cpp | 2 +- .../minecraft/world/entity/animal/SnowMan.cpp | 4 +- .../minecraft/world/entity/animal/Squid.cpp | 4 +- .../minecraft/world/entity/animal/Wolf.cpp | 2 +- .../entity/boss/enderdragon/EnderDragon.cpp | 36 ++-- .../world/entity/boss/wither/WitherBoss.cpp | 4 +- .../world/entity/item/FallingTile.cpp | 8 +- .../world/entity/item/ItemEntity.cpp | 2 +- .../minecraft/world/entity/item/Minecart.cpp | 2 +- .../world/entity/item/MinecartContainer.cpp | 12 +- .../world/entity/item/MinecartFurnace.cpp | 2 +- .../world/entity/item/MinecartTNT.cpp | 2 +- .../minecraft/world/entity/monster/Blaze.cpp | 4 +- .../minecraft/world/entity/monster/Ghast.cpp | 4 +- .../world/entity/monster/LavaSlime.cpp | 2 +- .../world/entity/monster/Skeleton.cpp | 14 +- .../minecraft/world/entity/monster/Slime.cpp | 2 +- .../minecraft/world/entity/monster/Spider.cpp | 2 +- .../minecraft/world/entity/monster/Witch.cpp | 4 +- .../minecraft/world/entity/monster/Zombie.cpp | 10 +- .../minecraft/world/entity/npc/Villager.cpp | 14 +- .../world/entity/player/Inventory.cpp | 2 +- .../minecraft/world/entity/player/Player.cpp | 4 +- .../world/entity/projectile/FishingHook.cpp | 4 +- .../world/entity/projectile/ThrownEgg.cpp | 2 +- .../world/entity/projectile/ThrownPotion.cpp | 4 +- .../minecraft/world/inventory/AnvilMenu.cpp | 2 +- .../world/inventory/CraftingMenu.cpp | 4 +- .../world/inventory/EnchantmentMenu.cpp | 2 +- .../world/inventory/FireworksMenu.cpp | 4 +- .../world/inventory/InventoryMenu.cpp | 4 +- .../minecraft/world/inventory/ResultSlot.cpp | 4 +- .../net/minecraft/world/item/BowItem.cpp | 2 +- .../net/minecraft/world/item/BowlFoodItem.cpp | 2 +- .../net/minecraft/world/item/EggItem.cpp | 2 +- .../net/minecraft/world/item/EmptyMapItem.cpp | 2 +- .../world/item/EnchantedBookItem.cpp | 6 +- .../net/minecraft/world/item/EnderEyeItem.cpp | 4 +- .../minecraft/world/item/FireworksItem.cpp | 4 +- .../minecraft/world/item/FishingRodItem.cpp | 2 +- .../world/item/HangingEntityItem.cpp | 4 +- .../net/minecraft/world/item/ItemInstance.cpp | 4 +- .../net/minecraft/world/item/MapItem.cpp | 10 +- .../net/minecraft/world/item/SnowballItem.cpp | 2 +- .../world/item/crafting/FireworksRecipe.cpp | 2 +- .../world/item/trading/MerchantRecipe.cpp | 4 +- .../net/minecraft/world/level/Level.cpp | 6 +- .../level/biome/TheEndBiomeDecorator.cpp | 2 +- .../level/levelgen/feature/HouseFeature.cpp | 2 +- .../level/levelgen/feature/SpikeFeature.cpp | 4 +- .../levelgen/structure/MineShaftPieces.cpp | 4 +- .../structure/ScatteredFeaturePieces.cpp | 2 +- .../level/newbiome/layer/FuzzyZoomLayer.cpp | 2 +- .../world/level/newbiome/layer/Layer.cpp | 48 +++--- .../level/newbiome/layer/SmoothZoomLayer.cpp | 2 +- .../world/level/newbiome/layer/ZoomLayer.cpp | 2 +- .../level/saveddata/MapItemSavedData.cpp | 4 +- .../world/level/storage/SavedDataStorage.cpp | 2 +- .../minecraft/world/level/tile/BeaconTile.cpp | 2 +- .../world/level/tile/BrewingStandTile.cpp | 8 +- .../minecraft/world/level/tile/ChestTile.cpp | 10 +- .../minecraft/world/level/tile/CocoaTile.cpp | 4 +- .../world/level/tile/CommandBlock.cpp | 2 +- .../world/level/tile/ComparatorTile.cpp | 2 +- .../world/level/tile/DispenserTile.cpp | 10 +- .../world/level/tile/DropperTile.cpp | 2 +- .../world/level/tile/EnchantmentTableTile.cpp | 2 +- .../world/level/tile/EnderChestTile.cpp | 2 +- .../world/level/tile/FlowerPotTile.cpp | 2 +- .../world/level/tile/FurnaceTile.cpp | 10 +- .../minecraft/world/level/tile/HopperTile.cpp | 8 +- .../world/level/tile/JukeboxTile.cpp | 4 +- .../minecraft/world/level/tile/LeafTile.cpp | 8 +- .../world/level/tile/MobSpawnerTile.cpp | 2 +- .../world/level/tile/NoteBlockTile.cpp | 2 +- .../world/level/tile/PumpkinTile.cpp | 2 +- .../world/level/tile/RedStoneOreTile.cpp | 2 +- .../minecraft/world/level/tile/SignTile.cpp | 2 +- .../minecraft/world/level/tile/SkullTile.cpp | 22 +-- .../minecraft/world/level/tile/StemTile.cpp | 2 +- .../world/level/tile/StoneMonsterTile.cpp | 4 +- .../world/level/tile/ThinFenceTile.cpp | 2 +- .../net/minecraft/world/level/tile/Tile.cpp | 6 +- .../world/level/tile/TopSnowTile.cpp | 2 +- .../minecraft/world/level/tile/VineTile.cpp | 2 +- .../level/tile/entity/BeaconTileEntity.cpp | 10 +- .../tile/entity/BrewingStandTileEntity.cpp | 6 +- .../level/tile/entity/ChestTileEntity.cpp | 2 +- .../level/tile/entity/CommandBlockEntity.cpp | 6 +- .../tile/entity/ComparatorTileEntity.cpp | 2 +- .../level/tile/entity/DispenserTileEntity.cpp | 2 +- .../level/tile/entity/DropperTileEntity.cpp | 2 +- .../entity/EnchantmentTableTileEntity.cpp | 2 +- .../tile/entity/EnderChestTileEntity.cpp | 2 +- .../level/tile/entity/FurnaceTileEntity.cpp | 2 +- .../level/tile/entity/HopperTileEntity.cpp | 2 +- .../tile/entity/MobSpawnerTileEntity.cpp | 6 +- .../level/tile/entity/MusicTileEntity.cpp | 2 +- .../tile/entity/PistonPieceTileEntity.cpp | 2 +- .../level/tile/entity/SignTileEntity.cpp | 2 +- .../level/tile/entity/SkullTileEntity.cpp | 6 +- .../level/tile/entity/TheEndPortalTile.cpp | 2 +- .../tile/entity/TheEndPortalTileEntity.cpp | 2 +- 246 files changed, 706 insertions(+), 720 deletions(-) diff --git a/minecraft/Minecraft.Client/Common/Consoles_App.cpp b/minecraft/Minecraft.Client/Common/Consoles_App.cpp index d8f475bda..708230912 100644 --- a/minecraft/Minecraft.Client/Common/Consoles_App.cpp +++ b/minecraft/Minecraft.Client/Common/Consoles_App.cpp @@ -3807,7 +3807,6 @@ int CMinecraftApp::UnlockFullInviteReturned(void* pParam, int iPad, if (ProfileManager.IsSignedInLive(iPad)) { // 4J-PB - need to check this user can access the store { - ProfileManager.DisplayFullVersionPurchase( false, iPad, /*eSen_UpsellID_Full_Version_Of_Game*/ 0); } } @@ -3825,7 +3824,6 @@ int CMinecraftApp::UnlockFullSaveReturned(void* pParam, int iPad, if (ProfileManager.IsSignedInLive(pMinecraft->player->GetXboxPad())) { // 4J-PB - need to check this user can access the store { - ProfileManager.DisplayFullVersionPurchase( false, pMinecraft->player->GetXboxPad(), /*eSen_UpsellID_Full_Version_Of_Game*/ 0); } @@ -3844,7 +3842,6 @@ int CMinecraftApp::UnlockFullExitReturned(void* pParam, int iPad, if (ProfileManager.IsSignedInLive(pMinecraft->player->GetXboxPad())) { // 4J-PB - need to check this user can access the store { - ProfileManager.DisplayFullVersionPurchase( false, pMinecraft->player->GetXboxPad(), /*eSen_UpsellID_Full_Version_Of_Game*/ 0); } @@ -3867,7 +3864,6 @@ int CMinecraftApp::TrialOverReturned(void* pParam, int iPad, if (ProfileManager.IsSignedInLive(pMinecraft->player->GetXboxPad())) { // 4J-PB - need to check this user can access the store { - ProfileManager.DisplayFullVersionPurchase( false, pMinecraft->player->GetXboxPad(), /*eSen_UpsellID_Full_Version_Of_Game*/ 0); } @@ -4128,12 +4124,6 @@ void CMinecraftApp::NotificationsCallback(void* pParam, pClass->m_vNotifications.push_back(pNotification); } -void CMinecraftApp::UpsellReturnedCallback(void* pParam, EUpsellType type, - EUpsellResponse result, - int iUserData) { - // 4jcraft: nuked -} - #if defined(_DEBUG_MENUS_ENABLED) bool CMinecraftApp::DebugArtToolsOn() { return DebugSettingsOn() && diff --git a/minecraft/Minecraft.Client/Common/Consoles_App.h b/minecraft/Minecraft.Client/Common/Consoles_App.h index bac38cc71..817f56e11 100644 --- a/minecraft/Minecraft.Client/Common/Consoles_App.h +++ b/minecraft/Minecraft.Client/Common/Consoles_App.h @@ -487,7 +487,6 @@ public: bool m_bChangingSessionType; bool m_bReallyChangingSessionType; - bool m_bDisplayFullVersionPurchase; // for after signing in during the // trial, and trying to unlock full // version on an upsell diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp index dbb3821a8..f38b530a5 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp @@ -45,7 +45,6 @@ void UIScene_TrialExitUpsell::handleInput(int iPad, int key, bool repeat, // 4J-PB - need to check this user can access the store { - ProfileManager.DisplayFullVersionPurchase( false, iPad, /*eSen_UpsellID_Full_Version_Of_Game*/ 0); } } diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp index efe34f931..6ca690deb 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp @@ -460,7 +460,6 @@ int UIScene_PauseMenu::UnlockFullSaveReturned( if (ProfileManager.IsSignedInLive(pMinecraft->player->GetXboxPad())) { // 4J-PB - need to check this user can access the store { - ProfileManager.DisplayFullVersionPurchase( false, pMinecraft->player->GetXboxPad(), /*eSen_UpsellID_Full_Version_Of_Game*/ 0); } diff --git a/minecraft/Minecraft.Client/Source Files/Extrax64Stubs.cpp b/minecraft/Minecraft.Client/Source Files/Extrax64Stubs.cpp index 201938809..584391d5a 100644 --- a/minecraft/Minecraft.Client/Source Files/Extrax64Stubs.cpp +++ b/minecraft/Minecraft.Client/Source Files/Extrax64Stubs.cpp @@ -495,7 +495,6 @@ void C_4JProfile::SetRichPresenceContextValue(int iPad, int iContextID, int iVal) {} void C_4JProfile::SetCurrentGameActivity(int iPad, int iNewPresence, bool bSetOthersToIdle) {} -void C_4JProfile::DisplayFullVersionPurchase(bool bRequired, int iQuadrant, int iUpsellParam) {} void C_4JProfile::SetUpsellCallback(void (*Func)(void* lpParam, EUpsellType type, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp b/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp index d8b584eba..f1c06adb0 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp @@ -3337,7 +3337,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { // std::dynamic_pointer_cast(Wolf::_class->newInstance( // level )); std::shared_ptr mob = std::dynamic_pointer_cast( - std::shared_ptr(new Spider(level))); + std::make_shared(level)); mob->moveTo(player->x + 1, player->y, player->z + 1, level->random->nextFloat() * 360, 0); level->addEntity(mob); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/MerchantScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/MerchantScreen.cpp index 6aedc4515..8882307cc 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/MerchantScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/MerchantScreen.cpp @@ -171,9 +171,9 @@ void MerchantScreen::tick() { DataOutputStream output(&rawOutput); output.writeInt(currentRecipeIndex); minecraft->player->connection->send( - std::shared_ptr(new CustomPayloadPacket( + std::make_shared( CustomPayloadPacket::TRADER_SELECTION_PACKET, - rawOutput.toByteArray()))); + rawOutput.toByteArray())); } } else { nextRecipeButton->active = false; @@ -200,8 +200,8 @@ void MerchantScreen::buttonClicked(Button* button) { DataOutputStream output(&rawOutput); output.writeInt(currentRecipeIndex); minecraft->player->connection->send( - std::shared_ptr(new CustomPayloadPacket( + std::make_shared( CustomPayloadPacket::TRADER_SELECTION_PACKET, - rawOutput.toByteArray()))); + rawOutput.toByteArray())); } } \ No newline at end of file diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/RepairScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/RepairScreen.cpp index a5ea6aa5c..ad4836451 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/RepairScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/RepairScreen.cpp @@ -160,8 +160,8 @@ void RepairScreen::updateItemName() { DataOutputStream dos(&baos); dos.writeUTF(itemName); Minecraft::GetInstance()->player->connection->send( - std::shared_ptr(new CustomPayloadPacket( - CustomPayloadPacket::SET_ITEM_NAME_PACKET, baos.toByteArray()))); + std::make_shared( + CustomPayloadPacket::SET_ITEM_NAME_PACKET, baos.toByteArray())); } // 4jcraft: these 3 are to implement Containerlistener (see IUIScene_AnvilMenu diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconScreen.cpp index 1e9a2d3e1..9ef73f33c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconScreen.cpp @@ -162,11 +162,11 @@ void BeaconScreen::renderBg(float a) { // Render payment item icons itemRenderer->renderGuiItem( font, minecraft->textures, - std::shared_ptr(new ItemInstance(Item::emerald_Id, 1, 0)), + std::make_shared(Item::emerald_Id, 1, 0), xo + 42, yo + 109); itemRenderer->renderGuiItem( font, minecraft->textures, - std::shared_ptr(new ItemInstance(Item::diamond_Id, 1, 0)), + std::make_shared(Item::diamond_Id, 1, 0), xo + 42 + 22, yo + 109); itemRenderer->renderGuiItem(font, minecraft->textures, std::shared_ptr( @@ -206,8 +206,8 @@ void BeaconScreen::buttonClicked(Button* button) { dos.writeInt(beacon->getSecondaryPower()); minecraft->player->connection->send( - std::shared_ptr(new CustomPayloadPacket( - CustomPayloadPacket::SET_BEACON_PACKET, baos.toByteArray()))); + std::make_shared( + CustomPayloadPacket::SET_BEACON_PACKET, baos.toByteArray())); minecraft->player->closeContainer(); } else if (dynamic_cast(button)) { int effectId = button->id & 255; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp index a69fb7308..e19b68596 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp @@ -390,10 +390,10 @@ void ClientConnection::handleAddEntity( packet->data = 0; } break; case AddEntityPacket::ARROW: - e = std::shared_ptr(new Arrow(level, x, y, z)); + e = std::make_shared(level, x, y, z); break; case AddEntityPacket::SNOWBALL: - e = std::shared_ptr(new Snowball(level, x, y, z)); + e = std::make_shared(level, x, y, z); break; case AddEntityPacket::ITEM_FRAME: { int ix = (int)x; @@ -408,10 +408,10 @@ void ClientConnection::handleAddEntity( setRot = false; break; case AddEntityPacket::THROWN_ENDERPEARL: - e = std::shared_ptr(new ThrownEnderpearl(level, x, y, z)); + e = std::make_shared(level, x, y, z); break; case AddEntityPacket::EYEOFENDERSIGNAL: - e = std::shared_ptr(new EyeOfEnderSignal(level, x, y, z)); + e = std::make_shared(level, x, y, z); break; case AddEntityPacket::FIREBALL: e = std::shared_ptr( @@ -432,7 +432,7 @@ void ClientConnection::handleAddEntity( packet->data = 0; break; case AddEntityPacket::EGG: - e = std::shared_ptr(new ThrownEgg(level, x, y, z)); + e = std::make_shared(level, x, y, z); break; case AddEntityPacket::THROWN_POTION: e = std::shared_ptr( @@ -440,24 +440,24 @@ void ClientConnection::handleAddEntity( packet->data = 0; break; case AddEntityPacket::THROWN_EXPBOTTLE: - e = std::shared_ptr(new ThrownExpBottle(level, x, y, z)); + e = std::make_shared(level, x, y, z); packet->data = 0; break; case AddEntityPacket::BOAT: - e = std::shared_ptr(new Boat(level, x, y, z)); + e = std::make_shared(level, x, y, z); break; case AddEntityPacket::PRIMED_TNT: - e = std::shared_ptr(new PrimedTnt(level, x, y, z, nullptr)); + e = std::make_shared(level, x, y, z, nullptr); break; case AddEntityPacket::ENDER_CRYSTAL: - e = std::shared_ptr(new EnderCrystal(level, x, y, z)); + e = std::make_shared(level, x, y, z); break; case AddEntityPacket::ITEM: - e = std::shared_ptr(new ItemEntity(level, x, y, z)); + e = std::make_shared(level, x, y, z); break; case AddEntityPacket::FALLING: - e = std::shared_ptr(new FallingTile( - level, x, y, z, packet->data & 0xFFFF, packet->data >> 16)); + e = std::make_shared( + level, x, y, z, packet->data & 0xFFFF, packet->data >> 16); packet->data = 0; break; case AddEntityPacket::WITHER_SKULL: @@ -667,7 +667,7 @@ void ClientConnection::handleAddGlobalEntity( double z = packet->z / 32.0; std::shared_ptr e; // = nullptr; if (packet->type == AddGlobalEntityPacket::LIGHTNING) - e = std::shared_ptr(new LightningBolt(level, x, y, z)); + e = std::make_shared(level, x, y, z); if (e != nullptr) { e->xp = packet->x; e->yp = packet->y; @@ -681,8 +681,8 @@ void ClientConnection::handleAddGlobalEntity( void ClientConnection::handleAddPainting( std::shared_ptr packet) { - std::shared_ptr painting = std::shared_ptr(new Painting( - level, packet->x, packet->y, packet->z, packet->dir, packet->motive)); + std::shared_ptr painting = std::make_shared( + level, packet->x, packet->y, packet->z, packet->dir, packet->motive); level->putEntity(packet->id, painting); } @@ -749,7 +749,7 @@ void ClientConnection::handleAddPlayer( std::shared_ptr(); // nullptr; } else { player->inventory->items[player->inventory->selected] = - std::shared_ptr(new ItemInstance(item, 1, 0)); + std::make_shared(item, 1, 0); } player->absMoveTo(x, y, z, yRot, xRot); @@ -1934,12 +1934,12 @@ void ClientConnection::handlePreLogin(std::shared_ptr packet) { minecraft->user->name.c_str(), SharedConstants::NETWORK_PROTOCOL_VERSION, m_userIndex, (int)g_NetworkManager.IsHost()); - send(std::shared_ptr(new LoginPacket( + send(std::make_shared( minecraft->user->name, SharedConstants::NETWORK_PROTOCOL_VERSION, offlineXUID, onlineXUID, (!allAllowed && friendsAllowed), packet->m_ugcPlayersVersion, app.GetPlayerSkinId(m_userIndex), app.GetPlayerCapeId(m_userIndex), - ProfileManager.IsGuest(m_userIndex)))); + ProfileManager.IsGuest(m_userIndex))); fprintf(stderr, "[LOGIN] LoginPacket sent successfully\n"); if (!g_NetworkManager.IsHost()) { @@ -2519,7 +2519,7 @@ void ClientConnection::handleContainerOpen( } break; case ContainerOpenPacket::HOPPER: { std::shared_ptr hopper = - std::shared_ptr(new HopperTileEntity()); + std::make_shared(); if (packet->customName) hopper->setCustomName(packet->title); if (player->openHopper(hopper)) { player->containerMenu->containerId = packet->containerId; @@ -2529,7 +2529,7 @@ void ClientConnection::handleContainerOpen( } break; case ContainerOpenPacket::FURNACE: { std::shared_ptr furnace = - std::shared_ptr(new FurnaceTileEntity()); + std::make_shared(); if (packet->customName) furnace->setCustomName(packet->title); if (player->openFurnace(furnace)) { player->containerMenu->containerId = packet->containerId; @@ -2551,7 +2551,7 @@ void ClientConnection::handleContainerOpen( } break; case ContainerOpenPacket::DROPPER: { std::shared_ptr dropper = - std::shared_ptr(new DropperTileEntity()); + std::make_shared(); if (packet->customName) dropper->setCustomName(packet->title); if (player->openTrap(dropper)) { @@ -2562,7 +2562,7 @@ void ClientConnection::handleContainerOpen( } break; case ContainerOpenPacket::TRAP: { std::shared_ptr dispenser = - std::shared_ptr(new DispenserTileEntity()); + std::make_shared(); if (packet->customName) dispenser->setCustomName(packet->title); if (player->openTrap(dispenser)) { @@ -2604,7 +2604,7 @@ void ClientConnection::handleContainerOpen( } break; case ContainerOpenPacket::BEACON: { std::shared_ptr beacon = - std::shared_ptr(new BeaconTileEntity()); + std::make_shared(); if (packet->customName) beacon->setCustomName(packet->title); if (player->openBeacon(beacon)) { @@ -2715,8 +2715,8 @@ void ClientConnection::handleContainerAck( } if (menu != nullptr) { if (!packet->accepted) { - send(std::shared_ptr(new ContainerAckPacket( - packet->containerId, packet->uid, true))); + send(std::make_shared( + packet->containerId, packet->uid, true)); } } } @@ -2740,7 +2740,7 @@ void ClientConnection::handleTileEditorOpen( minecraft->localplayers[m_userIndex]->openTextEdit(tileEntity); } else if (packet->editorType == TileEditorOpenPacket::SIGN) { std::shared_ptr localSignDummy = - std::shared_ptr(new SignTileEntity()); + std::make_shared(); localSignDummy->setLevel(level); localSignDummy->x = packet->x; localSignDummy->y = packet->y; @@ -3183,7 +3183,7 @@ void ClientConnection::displayPrivilegeChanges( void ClientConnection::handleKeepAlive( std::shared_ptr packet) { - send(std::shared_ptr(new KeepAlivePacket(packet->id))); + send(std::make_shared(packet->id)); } void ClientConnection::handlePlayerAbilities( diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.cpp index 0b4c585ff..e6e3886b4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.cpp @@ -113,20 +113,20 @@ void MultiPlayerGameMode::startDestroyBlock(int x, int y, int z, int face) { if (localPlayerMode->isCreative()) { connection->send( - std::shared_ptr(new PlayerActionPacket( - PlayerActionPacket::START_DESTROY_BLOCK, x, y, z, face))); + std::make_shared( + PlayerActionPacket::START_DESTROY_BLOCK, x, y, z, face)); creativeDestroyBlock(minecraft, this, x, y, z, face); destroyDelay = 5; } else if (!isDestroying || !sameDestroyTarget(x, y, z)) { if (isDestroying) { connection->send( - std::shared_ptr(new PlayerActionPacket( + std::make_shared( PlayerActionPacket::ABORT_DESTROY_BLOCK, xDestroyBlock, - yDestroyBlock, zDestroyBlock, face))); + yDestroyBlock, zDestroyBlock, face)); } connection->send( - std::shared_ptr(new PlayerActionPacket( - PlayerActionPacket::START_DESTROY_BLOCK, x, y, z, face))); + std::make_shared( + PlayerActionPacket::START_DESTROY_BLOCK, x, y, z, face)); int t = minecraft->level->getTile(x, y, z); if (t > 0 && destroyProgress == 0) Tile::tiles[t]->attack(minecraft->level, x, y, z, @@ -156,9 +156,9 @@ void MultiPlayerGameMode::startDestroyBlock(int x, int y, int z, int face) { void MultiPlayerGameMode::stopDestroyBlock() { if (isDestroying) { connection->send( - std::shared_ptr(new PlayerActionPacket( + std::make_shared( PlayerActionPacket::ABORT_DESTROY_BLOCK, xDestroyBlock, - yDestroyBlock, zDestroyBlock, -1))); + yDestroyBlock, zDestroyBlock, -1)); } isDestroying = false; @@ -183,8 +183,8 @@ void MultiPlayerGameMode::continueDestroyBlock(int x, int y, int z, int face) { if (localPlayerMode->isCreative()) { destroyDelay = 5; connection->send( - std::shared_ptr(new PlayerActionPacket( - PlayerActionPacket::START_DESTROY_BLOCK, x, y, z, face))); + std::make_shared( + PlayerActionPacket::START_DESTROY_BLOCK, x, y, z, face)); creativeDestroyBlock(minecraft, this, x, y, z, face); return; } @@ -216,8 +216,8 @@ void MultiPlayerGameMode::continueDestroyBlock(int x, int y, int z, int face) { if (destroyProgress >= 1) { isDestroying = false; connection->send( - std::shared_ptr(new PlayerActionPacket( - PlayerActionPacket::STOP_DESTROY_BLOCK, x, y, z, face))); + std::make_shared( + PlayerActionPacket::STOP_DESTROY_BLOCK, x, y, z, face)); destroyBlock(x, y, z, face); destroyProgress = 0; destroyTicks = 0; @@ -406,31 +406,31 @@ bool MultiPlayerGameMode::useItem(std::shared_ptr player, Level* level, } if (!bTestUseOnly) { - connection->send(std::shared_ptr(new UseItemPacket( - -1, -1, -1, 255, player->inventory->getSelected(), 0, 0, 0))); + connection->send(std::make_shared( + -1, -1, -1, 255, player->inventory->getSelected(), 0, 0, 0)); } return result; } std::shared_ptr MultiPlayerGameMode::createPlayer( Level* level) { - return std::shared_ptr(new MultiplayerLocalPlayer( - minecraft, level, minecraft->user, connection)); + return std::make_shared( + minecraft, level, minecraft->user, connection); } void MultiPlayerGameMode::attack(std::shared_ptr player, std::shared_ptr entity) { ensureHasSentCarriedItem(); - connection->send(std::shared_ptr(new InteractPacket( - player->entityId, entity->entityId, InteractPacket::ATTACK))); + connection->send(std::make_shared( + player->entityId, entity->entityId, InteractPacket::ATTACK)); player->attack(entity); } bool MultiPlayerGameMode::interact(std::shared_ptr player, std::shared_ptr entity) { ensureHasSentCarriedItem(); - connection->send(std::shared_ptr(new InteractPacket( - player->entityId, entity->entityId, InteractPacket::INTERACT))); + connection->send(std::make_shared( + player->entityId, entity->entityId, InteractPacket::INTERACT)); return player->interact(entity); } @@ -475,8 +475,8 @@ void MultiPlayerGameMode::handleCreativeModeItemDrop( void MultiPlayerGameMode::releaseUsingItem(std::shared_ptr player) { ensureHasSentCarriedItem(); - connection->send(std::shared_ptr(new PlayerActionPacket( - PlayerActionPacket::RELEASE_USE_ITEM, 0, 0, 0, 255))); + connection->send(std::make_shared( + PlayerActionPacket::RELEASE_USE_ITEM, 0, 0, 0, 255)); player->releaseUsingItem(); } @@ -517,5 +517,5 @@ void MultiPlayerGameMode::handleDebugOptions(unsigned int uiVal, std::shared_ptr player) { player->SetDebugOptions(uiVal); connection->send( - std::shared_ptr(new DebugOptionsPacket(uiVal))); + std::make_shared(uiVal)); } diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.cpp index 390112c91..1dda463c3 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.cpp @@ -29,7 +29,7 @@ MultiPlayerLevel::ResetInfo::ResetInfo(int x, int y, int z, int tile, MultiPlayerLevel::MultiPlayerLevel(ClientConnection* connection, LevelSettings* levelSettings, int dimension, int difficulty) - : Level(std::shared_ptr(new MockedLevelStorage()), + : Level(std::make_shared(), L"MpServer", Dimension::getNew(dimension), levelSettings, false) { minecraft = Minecraft::GetInstance(); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp index 726dda674..cb72cb1d8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp @@ -81,11 +81,11 @@ void MultiplayerLocalPlayer::tick() { tempX, tempY, tempZ, x, y, z)) { if (isRiding()) { connection->send( - std::shared_ptr(new MovePlayerPacket::Rot( - yRot, xRot, onGround, abilities.flying))); + std::make_shared( + yRot, xRot, onGround, abilities.flying)); connection->send( - std::shared_ptr(new PlayerInputPacket( - xxa, yya, input->jumping, input->sneaking))); + std::make_shared( + xxa, yya, input->jumping, input->sneaking)); } else { sendPosition(); } @@ -101,12 +101,12 @@ void MultiplayerLocalPlayer::sendPosition() { if (sprinting != lastSprinting) { if (sprinting) connection->send( - std::shared_ptr(new PlayerCommandPacket( - shared_from_this(), PlayerCommandPacket::START_SPRINTING))); + std::make_shared( + shared_from_this(), PlayerCommandPacket::START_SPRINTING)); else connection->send( - std::shared_ptr(new PlayerCommandPacket( - shared_from_this(), PlayerCommandPacket::STOP_SPRINTING))); + std::make_shared( + shared_from_this(), PlayerCommandPacket::STOP_SPRINTING)); lastSprinting = sprinting; } @@ -115,12 +115,12 @@ void MultiplayerLocalPlayer::sendPosition() { if (sneaking != lastSneaked) { if (sneaking) connection->send( - std::shared_ptr(new PlayerCommandPacket( - shared_from_this(), PlayerCommandPacket::START_SNEAKING))); + std::make_shared( + shared_from_this(), PlayerCommandPacket::START_SNEAKING)); else connection->send( - std::shared_ptr(new PlayerCommandPacket( - shared_from_this(), PlayerCommandPacket::STOP_SNEAKING))); + std::make_shared( + shared_from_this(), PlayerCommandPacket::STOP_SNEAKING)); lastSneaked = sneaking; } @@ -129,12 +129,12 @@ void MultiplayerLocalPlayer::sendPosition() { if (idle != lastIdle) { if (idle) connection->send( - std::shared_ptr(new PlayerCommandPacket( - shared_from_this(), PlayerCommandPacket::START_IDLEANIM))); + std::make_shared( + shared_from_this(), PlayerCommandPacket::START_IDLEANIM)); else connection->send( - std::shared_ptr(new PlayerCommandPacket( - shared_from_this(), PlayerCommandPacket::STOP_IDLEANIM))); + std::make_shared( + shared_from_this(), PlayerCommandPacket::STOP_IDLEANIM)); lastIdle = idle; } @@ -151,22 +151,22 @@ void MultiplayerLocalPlayer::sendPosition() { bool rot = rydd != 0 || rxdd != 0; if (riding != nullptr) { connection->send( - std::shared_ptr(new MovePlayerPacket::PosRot( - xd, -999, -999, zd, yRot, xRot, onGround, abilities.flying))); + std::make_shared( + xd, -999, -999, zd, yRot, xRot, onGround, abilities.flying)); move = false; } else { if (move && rot) { connection->send( - std::shared_ptr(new MovePlayerPacket::PosRot( - x, bb.y0, y, z, yRot, xRot, onGround, abilities.flying))); + std::make_shared( + x, bb.y0, y, z, yRot, xRot, onGround, abilities.flying)); } else if (move) { connection->send( - std::shared_ptr(new MovePlayerPacket::Pos( - x, bb.y0, y, z, onGround, abilities.flying))); + std::make_shared( + x, bb.y0, y, z, onGround, abilities.flying)); } else if (rot) { connection->send( - std::shared_ptr(new MovePlayerPacket::Rot( - yRot, xRot, onGround, abilities.flying))); + std::make_shared( + yRot, xRot, onGround, abilities.flying)); } else { connection->send(std::shared_ptr( new MovePlayerPacket(onGround, abilities.flying))); @@ -199,7 +199,7 @@ void MultiplayerLocalPlayer::reallyDrop( std::shared_ptr itemEntity) {} void MultiplayerLocalPlayer::chat(const std::wstring& message) { - connection->send(std::shared_ptr(new ChatPacket(message))); + connection->send(std::make_shared(message)); } void MultiplayerLocalPlayer::swing() { @@ -313,15 +313,15 @@ bool MultiplayerLocalPlayer::isLocalPlayer() { return true; } void MultiplayerLocalPlayer::sendRidingJump() { connection->send( - std::shared_ptr(new PlayerCommandPacket( + std::make_shared( shared_from_this(), PlayerCommandPacket::RIDING_JUMP, - (int)(getJumpRidingScale() * 100.0f)))); + (int)(getJumpRidingScale() * 100.0f))); } void MultiplayerLocalPlayer::sendOpenInventory() { connection->send( - std::shared_ptr(new PlayerCommandPacket( - shared_from_this(), PlayerCommandPacket::OPEN_INVENTORY))); + std::make_shared( + shared_from_this(), PlayerCommandPacket::OPEN_INVENTORY)); } void MultiplayerLocalPlayer::ride(std::shared_ptr e) { @@ -353,8 +353,8 @@ void MultiplayerLocalPlayer::ride(std::shared_ptr e) { void MultiplayerLocalPlayer::StopSleeping() { connection->send( - std::shared_ptr(new PlayerCommandPacket( - shared_from_this(), PlayerCommandPacket::STOP_SLEEPING))); + std::make_shared( + shared_from_this(), PlayerCommandPacket::STOP_SLEEPING)); } // 4J Added @@ -380,9 +380,9 @@ void MultiplayerLocalPlayer::setAndBroadcastCustomCape(std::uint32_t capeId) { #endif if (getCustomCape() != oldCapeIndex) connection->send( - std::shared_ptr(new TextureChangePacket( + std::make_shared( shared_from_this(), TextureChangePacket::e_TextureChange_Cape, - app.GetPlayerCapeName(GetXboxPad())))); + app.GetPlayerCapeName(GetXboxPad()))); } // 4J added for testing. This moves the player in a repeated sequence of 2 diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ReceivingLevelScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ReceivingLevelScreen.cpp index 9b49e3275..71d9ce8e0 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ReceivingLevelScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ReceivingLevelScreen.cpp @@ -16,7 +16,7 @@ void ReceivingLevelScreen::tick() { tickCount++; if (tickCount % 20 == 0) { connection->send( - std::shared_ptr(new KeepAlivePacket())); + std::make_shared()); } if (connection != nullptr) { connection->tick(); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/ParticleEngine.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/ParticleEngine.cpp index 04a41112d..87ca06d70 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/ParticleEngine.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/ParticleEngine.cpp @@ -207,9 +207,9 @@ void ParticleEngine::destroy(int x, int y, int z, int tid, int data) { double yp = y + (yy + 0.5) / SD; double zp = z + (zz + 0.5) / SD; int face = random->nextInt(6); - add((std::shared_ptr(new TerrainParticle( + add((std::make_shared( level, xp, yp, zp, xp - x - 0.5f, yp - y - 0.5f, - zp - z - 0.5f, tile, face, data, textures))) + zp - z - 0.5f, tile, face, data, textures)) ->init(x, y, z, data)); } } diff --git a/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.cpp index c3473afdf..2caab4abd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.cpp @@ -745,8 +745,8 @@ void LocalPlayer::magicCrit(std::shared_ptr e) { void LocalPlayer::take(std::shared_ptr e, int orgCount) { minecraft->particleEngine->add( - std::shared_ptr(new TakeAnimationParticle( - (Level*)minecraft->level, e, shared_from_this(), -0.5f))); + std::make_shared( + (Level*)minecraft->level, e, shared_from_this(), -0.5f)); } void LocalPlayer::chat(const std::wstring& message) {} diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/EntityTileRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/EntityTileRenderer.cpp index a021d895d..661ffb228 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/EntityTileRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/EntityTileRenderer.cpp @@ -7,11 +7,11 @@ EntityTileRenderer* EntityTileRenderer::instance = new EntityTileRenderer; EntityTileRenderer::EntityTileRenderer() { - chest = std::shared_ptr(new ChestTileEntity()); + chest = std::make_shared(); trappedChest = std::shared_ptr( new ChestTileEntity(ChestTile::TYPE_TRAP)); enderChest = - std::shared_ptr(new EnderChestTileEntity()); + std::make_shared(); } void EntityTileRenderer::render(Tile* tile, int data, float brightness, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp index ca01048fc..8db981075 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp @@ -1544,10 +1544,10 @@ void GameRenderer::tickRain() { if (t > 0) { if (Tile::tiles[t]->material == Material::lava) { mc->particleEngine->add( - std::shared_ptr(new SmokeParticle( + std::make_shared( level, x + xa, y + 0.1f - Tile::tiles[t]->getShapeY0(), z + za, 0, - 0, 0))); + 0, 0)); } else { if (random->nextInt(++rainPosSamples) == 0) { rainPosX = x + xa; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.cpp index 290f20c5c..c1423406f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.cpp @@ -3079,7 +3079,7 @@ std::shared_ptr LevelRenderer::addParticleInternal( break; case eParticleType_lava: particle = - std::shared_ptr(new LavaParticle(lev, x, y, z)); + std::make_shared(lev, x, y, z); break; case eParticleType_footstep: particle = std::shared_ptr( @@ -3094,12 +3094,12 @@ std::shared_ptr LevelRenderer::addParticleInternal( new SmokeParticle(lev, x, y, z, xa, ya, za, 2.5f)); break; case eParticleType_reddust: - particle = std::shared_ptr(new RedDustParticle( - lev, x, y, z, (float)xa, (float)ya, (float)za)); + particle = std::make_shared( + lev, x, y, z, (float)xa, (float)ya, (float)za); break; case eParticleType_snowballpoof: - particle = std::shared_ptr(new BreakingItemParticle( - lev, x, y, z, Item::snowBall, textures)); + particle = std::make_shared( + lev, x, y, z, Item::snowBall, textures); break; case eParticleType_dripWater: particle = std::shared_ptr( @@ -3114,8 +3114,8 @@ std::shared_ptr LevelRenderer::addParticleInternal( new SnowShovelParticle(lev, x, y, z, xa, ya, za)); break; case eParticleType_slime: - particle = std::shared_ptr(new BreakingItemParticle( - lev, x, y, z, Item::slimeBall, textures)); + particle = std::make_shared( + lev, x, y, z, Item::slimeBall, textures); break; case eParticleType_heart: particle = std::shared_ptr( @@ -3142,8 +3142,8 @@ std::shared_ptr LevelRenderer::addParticleInternal( (eParticleType <= eParticleType_iconcrack_last)) { int id = PARTICLE_CRACK_ID(eParticleType), data = PARTICLE_CRACK_DATA(eParticleType); - particle = std::shared_ptr(new BreakingItemParticle( - lev, x, y, z, xa, ya, za, Item::items[id], textures, data)); + particle = std::make_shared( + lev, x, y, z, xa, ya, za, Item::items[id], textures, data); } else if ((eParticleType >= eParticleType_tilecrack_base) && (eParticleType <= eParticleType_tilecrack_last)) { int id = PARTICLE_CRACK_ID(eParticleType), diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.cpp index bba0a5b90..e02d79b92 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.cpp @@ -358,7 +358,7 @@ bool b2 = !mob->isCapeHidden();*/ glTranslatef(-1 / 16.0f, 7 / 16.0f, 1 / 16.0f); if (mob->fishing != nullptr) { - item = std::shared_ptr(new ItemInstance(Item::stick)); + item = std::make_shared(Item::stick); } UseAnim anim = UseAnim_none; // null; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SnowManRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SnowManRenderer.cpp index 41d908017..498731f74 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SnowManRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SnowManRenderer.cpp @@ -24,7 +24,7 @@ void SnowManRenderer::additionalRendering(std::shared_ptr _mob, MobRenderer::additionalRendering(mob, a); std::shared_ptr headGear = - std::shared_ptr(new ItemInstance(Tile::pumpkin, 1)); + std::make_shared(Tile::pumpkin, 1); if (headGear != nullptr && headGear->getItem()->id < 256) { glPushMatrix(); model->head->translateTo(1 / 16.0f); diff --git a/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp b/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp index 520788d7a..394033154 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp @@ -402,8 +402,8 @@ bool MinecraftServer::loadLevel(LevelStorageSource* storageSource, new McRegionLevelStorage(newFormatSave, File(L"."), name, true)); #else storage = - std::shared_ptr(new McRegionLevelStorage( - new ConsoleSaveFileOriginal(L""), File(L"."), name, true)); + std::make_shared( + new ConsoleSaveFileOriginal(L""), File(L"."), name, true); #endif } @@ -1434,10 +1434,10 @@ void MinecraftServer::tick() { if (tickCount % 20 == 0) { players->broadcastAll( - std::shared_ptr(new SetTimePacket( + std::make_shared( level->getGameTime(), level->getDayTime(), level->getGameRules()->getBoolean( - GameRules::RULE_DAYLIGHT))), + GameRules::RULE_DAYLIGHT)), level->dimension->id); } // #ifndef 0 diff --git a/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp b/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp index 9cc5650c3..2862f2aae 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp @@ -129,10 +129,10 @@ void PlayerList::placeNewPlayer(Connection* connection, #endif // 4J Added - Give every player a map the first time they join a server player->inventory->setItem( - 9, std::shared_ptr(new ItemInstance( + 9, std::make_shared( Item::map_Id, 1, level->getAuxValueForMap(player->getXuid(), 0, centreXC, - centreZC, mapScale)))); + centreZC, mapScale))); if (app.getGameRuleDefinitions() != nullptr) { app.getGameRuleDefinitions()->postProcessPlayer(player); } @@ -199,8 +199,8 @@ void PlayerList::placeNewPlayer(Connection* connection, } // std::shared_ptr playerConnection = - // std::shared_ptr(new PlayerConnection(server, - // connection, player)); + // std::make_shared(server, + // connection, player); player->connection = playerConnection; // Used to be assigned in PlayerConnection ctor but // moved out so we can use std::shared_ptr @@ -216,7 +216,7 @@ void PlayerList::placeNewPlayer(Connection* connection, addPlayerToReceiving(player); - playerConnection->send(std::shared_ptr(new LoginPacket( + playerConnection->send(std::make_shared( L"", player->entityId, level->getLevelData()->getGenerator(), level->getSeed(), player->gameMode->getGameModeForPlayer()->getId(), (uint8_t)level->dimension->id, (uint8_t)level->getMaxBuildHeight(), @@ -225,7 +225,7 @@ void PlayerList::placeNewPlayer(Connection* connection, (uint8_t)playerIndex, level->useNewSeaLevel(), player->getAllPlayerGamePrivileges(), level->getLevelData()->getXZSize(), - level->getLevelData()->getHellScale()))); + level->getLevelData()->getHellScale())); playerConnection->send(std::shared_ptr( new SetSpawnPositionPacket(spawnPos->x, spawnPos->y, spawnPos->z))); playerConnection->send(std::shared_ptr( @@ -255,9 +255,9 @@ void PlayerList::placeNewPlayer(Connection* connection, player->xRot); server->getConnection()->addPlayerConnection(playerConnection); - playerConnection->send(std::shared_ptr(new SetTimePacket( + playerConnection->send(std::make_shared( level->getGameTime(), level->getDayTime(), - level->getGameRules()->getBoolean(GameRules::RULE_DAYLIGHT)))); + level->getGameRules()->getBoolean(GameRules::RULE_DAYLIGHT))); auto activeEffects = player->getActiveEffects(); for (auto it = activeEffects->begin(); it != activeEffects->end(); ++it) { @@ -443,7 +443,7 @@ void PlayerList::add(std::shared_ptr player) { // PlayerInfoPacket(player->name, true, 1000) ) ); if (player->connection->getNetworkPlayer()) { broadcastAll( - std::shared_ptr(new PlayerInfoPacket(player))); + std::make_shared(player)); } players.push_back(player); @@ -472,7 +472,7 @@ void PlayerList::add(std::shared_ptr player) { // PlayerInfoPacket(op->name, true, op->latency) ) ); if (op->connection->getNetworkPlayer()) { player->connection->send( - std::shared_ptr(new PlayerInfoPacket(op))); + std::make_shared(op)); } } @@ -484,12 +484,12 @@ void PlayerList::add(std::shared_ptr player) { if (firstSleepingPlayer == nullptr) firstSleepingPlayer = thisPlayer; thisPlayer->connection->send( - std::shared_ptr(new ChatPacket( - thisPlayer->name, ChatPacket::e_ChatBedMeSleep))); + std::make_shared( + thisPlayer->name, ChatPacket::e_ChatBedMeSleep)); } } - player->connection->send(std::shared_ptr(new ChatPacket( - firstSleepingPlayer->name, ChatPacket::e_ChatBedPlayerSleep))); + player->connection->send(std::make_shared( + firstSleepingPlayer->name, ChatPacket::e_ChatBedPlayerSleep)); } } @@ -714,8 +714,8 @@ std::shared_ptr PlayerList::respawn( player->setRespawnPosition(bedPosition, spawnForced); } else { player->connection->send( - std::shared_ptr(new GameEventPacket( - GameEventPacket::NO_RESPAWN_BED_AVAILABLE, 0))); + std::make_shared( + GameEventPacket::NO_RESPAWN_BED_AVAILABLE, 0)); } delete bedPosition; } @@ -727,19 +727,19 @@ std::shared_ptr PlayerList::respawn( player->setPos(player->x, player->y + 1, player->z); } - player->connection->send(std::shared_ptr(new RespawnPacket( + player->connection->send(std::make_shared( (char)player->dimension, player->level->getSeed(), player->level->getMaxBuildHeight(), player->gameMode->getGameModeForPlayer(), level->difficulty, level->getLevelData()->getGenerator(), player->level->useNewSeaLevel(), player->entityId, level->getLevelData()->getXZSize(), - level->getLevelData()->getHellScale()))); + level->getLevelData()->getHellScale())); player->connection->teleport(player->x, player->y, player->z, player->yRot, player->xRot); player->connection->send( - std::shared_ptr(new SetExperiencePacket( + std::make_shared( player->experienceProgress, player->totalExperience, - player->experienceLevel))); + player->experienceLevel)); if (keepAllPlayerData) { std::vector* activeEffects = @@ -851,13 +851,13 @@ void PlayerList::toggleDimension(std::shared_ptr player, // respawn packet we will be in the wrong level player->flushEntitiesToRemove(); - player->connection->send(std::shared_ptr(new RespawnPacket( + player->connection->send(std::make_shared( (char)player->dimension, newLevel->getSeed(), newLevel->getMaxBuildHeight(), player->gameMode->getGameModeForPlayer(), newLevel->difficulty, newLevel->getLevelData()->getGenerator(), newLevel->useNewSeaLevel(), player->entityId, newLevel->getLevelData()->getXZSize(), - newLevel->getLevelData()->getHellScale()))); + newLevel->getLevelData()->getHellScale())); oldLevel->removeEntityImmediately(player); player->removed = false; @@ -984,7 +984,7 @@ void PlayerList::tick() { // PlayerInfoPacket(op->name, true, op->latency) ) ); if (op->connection->getNetworkPlayer()) { broadcastAll( - std::shared_ptr(new PlayerInfoPacket(op))); + std::make_shared(op)); } } @@ -1278,7 +1278,7 @@ void PlayerList::sendMessage(const std::wstring& name, std::shared_ptr player = getPlayer(name); if (player != nullptr) { player->connection->send( - std::shared_ptr(new ChatPacket(message))); + std::make_shared(message)); } } @@ -1368,9 +1368,9 @@ void PlayerList::reloadWhitelist() {} void PlayerList::sendLevelInfo(std::shared_ptr player, ServerLevel* level) { - player->connection->send(std::shared_ptr(new SetTimePacket( + player->connection->send(std::make_shared( level->getGameTime(), level->getDayTime(), - level->getGameRules()->getBoolean(GameRules::RULE_DAYLIGHT)))); + level->getGameRules()->getBoolean(GameRules::RULE_DAYLIGHT))); if (level->isRaining()) { player->connection->send(std::shared_ptr( new GameEventPacket(GameEventPacket::START_RAINING, 0))); @@ -1385,9 +1385,9 @@ void PlayerList::sendLevelInfo(std::shared_ptr player, // send the stronghold position if there is one if ((level->dimension->id == 0) && level->getLevelData()->getHasStronghold()) { - player->connection->send(std::shared_ptr(new XZPacket( + player->connection->send(std::make_shared( XZPacket::STRONGHOLD, level->getLevelData()->getXStronghold(), - level->getLevelData()->getZStronghold()))); + level->getLevelData()->getZStronghold())); } } diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/GameMode.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/GameMode.cpp index 83b69247e..bfd3ef029 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/GameMode.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/GameMode.cpp @@ -96,8 +96,8 @@ void GameMode::adjustPlayer(std::shared_ptr player) {} // } std::shared_ptr GameMode::createPlayer(Level* level) { - return std::shared_ptr(new LocalPlayer( - minecraft, level, minecraft->user, level->dimension->id)); + return std::make_shared( + minecraft, level, minecraft->user, level->dimension->id); } bool GameMode::interact(std::shared_ptr player, diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.cpp index 7b556bf8e..edd27eb76 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.cpp @@ -368,8 +368,8 @@ bool PlayerChunkMap::PlayerChunk::broadcastChanges(bool allowRegionUpdate) { // MAX_CHANGES_BEFORE_RESEND (10) we only need to send a byte value in // the packet broadcast( - std::shared_ptr(new ChunkTilesUpdatePacket( - pos.x, pos.z, changedTiles, (uint8_t)changes, level))); + std::make_shared( + pos.x, pos.z, changedTiles, (uint8_t)changes, level)); for (int i = 0; i < changes; i++) { int x = pos.x * 16 + ((changedTiles[i] >> 12) & 15); int y = ((changedTiles[i]) & 255); diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp index 80855f645..f89ea328a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp @@ -1051,7 +1051,7 @@ std::shared_ptr ServerLevel::explode(std::shared_ptr source, // instead of calling super, we run the same explosion code here except // we don't generate any particles std::shared_ptr explosion = - std::shared_ptr(new Explosion(this, source, x, y, z, r)); + std::make_shared(this, source, x, y, z, r); explosion->fire = fire; explosion->destroyBlocks = destroyBlocks; explosion->explode(); @@ -1130,9 +1130,9 @@ void ServerLevel::runTileEvents() { TileEventData te = *it; server->getPlayers()->broadcast( te.getX(), te.getY(), te.getZ(), 64, dimension->id, - std::shared_ptr(new TileEventPacket( + std::make_shared( te.getX(), te.getY(), te.getZ(), te.getTile(), - te.getParamA(), te.getParamB()))); + te.getParamA(), te.getParamB())); } } tileEvents[runList].clear(); @@ -1203,9 +1203,9 @@ void ServerLevel::sendParticles(const std::wstring& name, double x, double y, double z, int count, double xDist, double yDist, double zDist, double speed) { std::shared_ptr packet = - std::shared_ptr(new LevelParticlesPacket( + std::make_shared( name, (float)x, (float)y, (float)z, (float)xDist, (float)yDist, - (float)zDist, (float)speed, count)); + (float)zDist, (float)speed, count); for (auto it = players.begin(); it != players.end(); ++it) { std::shared_ptr player = diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.cpp index 57d0ae076..da37d5d6b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.cpp @@ -549,9 +549,9 @@ void ServerPlayer::doTickB() { lastSentFood != foodData.getFoodLevel() || ((foodData.getSaturationLevel() == 0) != lastFoodSaturationZero)) { // 4J Stu - Added m_lastDamageSource for telemetry - connection->send(std::shared_ptr(new SetHealthPacket( + connection->send(std::make_shared( getHealth(), foodData.getFoodLevel(), foodData.getSaturationLevel(), - m_lastDamageSource))); + m_lastDamageSource)); lastSentHealth = getHealth(); lastSentFood = foodData.getFoodLevel(); lastFoodSaturationZero = foodData.getSaturationLevel() == 0; @@ -582,8 +582,8 @@ void ServerPlayer::doTickB() { if (totalExperience != lastSentExp) { lastSentExp = totalExperience; connection->send( - std::shared_ptr(new SetExperiencePacket( - experienceProgress, totalExperience, experienceLevel))); + std::make_shared( + experienceProgress, totalExperience, experienceLevel)); } } @@ -703,8 +703,8 @@ void ServerPlayer::changeDimension(int i) { m_enteredEndExitPortal = true; // We only flag this for the player in the portal connection->send( - std::shared_ptr(new GameEventPacket( - GameEventPacket::WIN_GAME, thisPlayer->GetUserIndex()))); + std::make_shared( + GameEventPacket::WIN_GAME, thisPlayer->GetUserIndex())); app.DebugPrintf("Sending packet to %d\n", thisPlayer->GetUserIndex()); } @@ -806,8 +806,8 @@ void ServerPlayer::stopSleepInBed(bool forcefulWakeUp, bool updateLevelList, void ServerPlayer::ride(std::shared_ptr e) { Player::ride(e); connection->send( - std::shared_ptr(new SetEntityLinkPacket( - SetEntityLinkPacket::RIDING, shared_from_this(), riding))); + std::make_shared( + SetEntityLinkPacket::RIDING, shared_from_this(), riding)); // 4J Removed this - The act of riding will be handled on the client and // will change the position of the player. If we also teleport it then we @@ -830,8 +830,8 @@ void ServerPlayer::openTextEdit(std::shared_ptr sign) { signTE->setAllowedPlayerEditor( std::dynamic_pointer_cast(shared_from_this())); connection->send( - std::shared_ptr(new TileEditorOpenPacket( - TileEditorOpenPacket::SIGN, sign->x, sign->y, sign->z))); + std::make_shared( + TileEditorOpenPacket::SIGN, sign->x, sign->y, sign->z)); } } @@ -843,9 +843,9 @@ bool ServerPlayer::startCrafting(int x, int y, int z) { if (containerMenu == inventoryMenu) { nextContainerCounter(); connection->send( - std::shared_ptr(new ContainerOpenPacket( + std::make_shared( containerCounter, ContainerOpenPacket::WORKBENCH, L"", 9, - false))); + false)); containerMenu = new CraftingMenu(inventory, level, x, y, z); containerMenu->containerId = containerCounter; containerMenu->addSlotListener(this); @@ -862,9 +862,9 @@ bool ServerPlayer::openFireworks(int x, int y, int z) { if (containerMenu == inventoryMenu) { nextContainerCounter(); connection->send( - std::shared_ptr(new ContainerOpenPacket( + std::make_shared( containerCounter, ContainerOpenPacket::FIREWORKS, L"", 9, - false))); + false)); containerMenu = new FireworksMenu(inventory, level, x, y, z); containerMenu->containerId = containerCounter; containerMenu->addSlotListener(this); @@ -873,9 +873,9 @@ bool ServerPlayer::openFireworks(int x, int y, int z) { nextContainerCounter(); connection->send( - std::shared_ptr(new ContainerOpenPacket( + std::make_shared( containerCounter, ContainerOpenPacket::FIREWORKS, L"", 9, - false))); + false)); containerMenu = new FireworksMenu(inventory, level, x, y, z); containerMenu->containerId = containerCounter; containerMenu->addSlotListener(this); @@ -893,9 +893,9 @@ bool ServerPlayer::startEnchanting(int x, int y, int z, if (containerMenu == inventoryMenu) { nextContainerCounter(); connection->send( - std::shared_ptr(new ContainerOpenPacket( + std::make_shared( containerCounter, ContainerOpenPacket::ENCHANTMENT, - name.empty() ? L"" : name, 9, !name.empty()))); + name.empty() ? L"" : name, 9, !name.empty())); containerMenu = new EnchantmentMenu(inventory, level, x, y, z); containerMenu->containerId = containerCounter; containerMenu->addSlotListener(this); @@ -912,9 +912,9 @@ bool ServerPlayer::startRepairing(int x, int y, int z) { if (containerMenu == inventoryMenu) { nextContainerCounter(); connection->send( - std::shared_ptr(new ContainerOpenPacket( + std::make_shared( containerCounter, ContainerOpenPacket::REPAIR_TABLE, L"", 9, - false))); + false)); containerMenu = new AnvilMenu( inventory, level, x, y, z, std::dynamic_pointer_cast(shared_from_this())); @@ -939,9 +939,9 @@ bool ServerPlayer::openContainer(std::shared_ptr container) { assert(containerType >= 0); connection->send( - std::shared_ptr(new ContainerOpenPacket( + std::make_shared( containerCounter, containerType, container->getCustomName(), - container->getContainerSize(), container->hasCustomName()))); + container->getContainerSize(), container->hasCustomName())); containerMenu = new ContainerMenu(inventory, container); containerMenu->containerId = containerCounter; @@ -958,10 +958,10 @@ bool ServerPlayer::openHopper(std::shared_ptr container) { if (containerMenu == inventoryMenu) { nextContainerCounter(); connection->send( - std::shared_ptr(new ContainerOpenPacket( + std::make_shared( containerCounter, ContainerOpenPacket::HOPPER, container->getCustomName(), container->getContainerSize(), - container->hasCustomName()))); + container->hasCustomName())); containerMenu = new HopperMenu(inventory, container); containerMenu->containerId = containerCounter; containerMenu->addSlotListener(this); @@ -978,10 +978,10 @@ bool ServerPlayer::openHopper(std::shared_ptr container) { if (containerMenu == inventoryMenu) { nextContainerCounter(); connection->send( - std::shared_ptr(new ContainerOpenPacket( + std::make_shared( containerCounter, ContainerOpenPacket::HOPPER, container->getCustomName(), container->getContainerSize(), - container->hasCustomName()))); + container->hasCustomName())); containerMenu = new HopperMenu(inventory, container); containerMenu->containerId = containerCounter; containerMenu->addSlotListener(this); @@ -998,10 +998,10 @@ bool ServerPlayer::openFurnace(std::shared_ptr furnace) { if (containerMenu == inventoryMenu) { nextContainerCounter(); connection->send( - std::shared_ptr(new ContainerOpenPacket( + std::make_shared( containerCounter, ContainerOpenPacket::FURNACE, furnace->getCustomName(), furnace->getContainerSize(), - furnace->hasCustomName()))); + furnace->hasCustomName())); containerMenu = new FurnaceMenu(inventory, furnace); containerMenu->containerId = containerCounter; containerMenu->addSlotListener(this); @@ -1017,13 +1017,13 @@ bool ServerPlayer::openTrap(std::shared_ptr trap) { if (containerMenu == inventoryMenu) { nextContainerCounter(); connection->send( - std::shared_ptr(new ContainerOpenPacket( + std::make_shared( containerCounter, trap->GetType() == eTYPE_DROPPERTILEENTITY ? ContainerOpenPacket::DROPPER : ContainerOpenPacket::TRAP, trap->getCustomName(), trap->getContainerSize(), - trap->hasCustomName()))); + trap->hasCustomName())); containerMenu = new TrapMenu(inventory, trap); containerMenu->containerId = containerCounter; containerMenu->addSlotListener(this); @@ -1040,10 +1040,10 @@ bool ServerPlayer::openBrewingStand( if (containerMenu == inventoryMenu) { nextContainerCounter(); connection->send( - std::shared_ptr(new ContainerOpenPacket( + std::make_shared( containerCounter, ContainerOpenPacket::BREWING_STAND, brewingStand->getCustomName(), brewingStand->getContainerSize(), - brewingStand->hasCustomName()))); + brewingStand->hasCustomName())); containerMenu = new BrewingStandMenu(inventory, brewingStand); containerMenu->containerId = containerCounter; containerMenu->addSlotListener(this); @@ -1060,10 +1060,10 @@ bool ServerPlayer::openBeacon(std::shared_ptr beacon) { if (containerMenu == inventoryMenu) { nextContainerCounter(); connection->send( - std::shared_ptr(new ContainerOpenPacket( + std::make_shared( containerCounter, ContainerOpenPacket::BEACON, beacon->getCustomName(), beacon->getContainerSize(), - beacon->hasCustomName()))); + beacon->hasCustomName())); containerMenu = new BeaconMenu(inventory, beacon); containerMenu->containerId = containerCounter; containerMenu->addSlotListener(this); @@ -1086,10 +1086,10 @@ bool ServerPlayer::openTrading(std::shared_ptr traderTarget, ((MerchantMenu*)containerMenu)->getTradeContainer(); connection->send( - std::shared_ptr(new ContainerOpenPacket( + std::make_shared( containerCounter, ContainerOpenPacket::TRADER_NPC, name.empty() ? L"" : name, container->getContainerSize(), - !name.empty()))); + !name.empty())); MerchantRecipeList* offers = traderTarget->getOffers( std::dynamic_pointer_cast(shared_from_this())); @@ -1121,10 +1121,10 @@ bool ServerPlayer::openHorseInventory(std::shared_ptr horse, } nextContainerCounter(); connection->send( - std::shared_ptr(new ContainerOpenPacket( + std::make_shared( containerCounter, ContainerOpenPacket::HORSE, horse->getCustomName(), container->getContainerSize(), - container->hasCustomName(), horse->entityId))); + container->hasCustomName(), horse->entityId)); containerMenu = new HorseInventoryMenu(inventory, container, horse); containerMenu->containerId = containerCounter; containerMenu->addSlotListener(this); @@ -1245,22 +1245,22 @@ void ServerPlayer::displayClientMessage(int messageId) { case IDS_TILE_BED_OCCUPIED: messageType = ChatPacket::e_ChatBedOccupied; connection->send( - std::shared_ptr(new ChatPacket(L"", messageType))); + std::make_shared(L"", messageType)); break; case IDS_TILE_BED_NO_SLEEP: messageType = ChatPacket::e_ChatBedNoSleep; connection->send( - std::shared_ptr(new ChatPacket(L"", messageType))); + std::make_shared(L"", messageType)); break; case IDS_TILE_BED_NOT_VALID: messageType = ChatPacket::e_ChatBedNotValid; connection->send( - std::shared_ptr(new ChatPacket(L"", messageType))); + std::make_shared(L"", messageType)); break; case IDS_TILE_BED_NOTSAFE: messageType = ChatPacket::e_ChatBedNotSafe; connection->send( - std::shared_ptr(new ChatPacket(L"", messageType))); + std::make_shared(L"", messageType)); break; case IDS_TILE_BED_PLAYERSLEEP: messageType = ChatPacket::e_ChatBedPlayerSleep; @@ -1271,8 +1271,8 @@ void ServerPlayer::displayClientMessage(int messageId) { server->getPlayers()->players[i]; if (shared_from_this() != player) { player->connection->send( - std::shared_ptr(new ChatPacket( - name, ChatPacket::e_ChatBedPlayerSleep))); + std::make_shared( + name, ChatPacket::e_ChatBedPlayerSleep)); } else { player->connection->send(std::shared_ptr( new ChatPacket(name, ChatPacket::e_ChatBedMeSleep))); @@ -1287,8 +1287,8 @@ void ServerPlayer::displayClientMessage(int messageId) { server->getPlayers()->players[i]; if (shared_from_this() != player) { player->connection->send( - std::shared_ptr(new ChatPacket( - name, ChatPacket::e_ChatPlayerEnteredEnd))); + std::make_shared( + name, ChatPacket::e_ChatPlayerEnteredEnd)); } } break; @@ -1306,7 +1306,7 @@ void ServerPlayer::displayClientMessage(int messageId) { case IDS_TILE_BED_MESLEEP: messageType = ChatPacket::e_ChatBedMeSleep; connection->send( - std::shared_ptr(new ChatPacket(L"", messageType))); + std::make_shared(L"", messageType)); break; case IDS_MAX_PIGS_SHEEP_COWS_CATS_SPAWNED: @@ -1316,8 +1316,8 @@ void ServerPlayer::displayClientMessage(int messageId) { server->getPlayers()->players[i]; if (shared_from_this() == player) { player->connection->send( - std::shared_ptr(new ChatPacket( - name, ChatPacket::e_ChatPlayerMaxPigsSheepCows))); + std::make_shared( + name, ChatPacket::e_ChatPlayerMaxPigsSheepCows)); } } break; @@ -1328,8 +1328,8 @@ void ServerPlayer::displayClientMessage(int messageId) { server->getPlayers()->players[i]; if (shared_from_this() == player) { player->connection->send( - std::shared_ptr(new ChatPacket( - name, ChatPacket::e_ChatPlayerMaxChickens))); + std::make_shared( + name, ChatPacket::e_ChatPlayerMaxChickens)); } } break; @@ -1340,8 +1340,8 @@ void ServerPlayer::displayClientMessage(int messageId) { server->getPlayers()->players[i]; if (shared_from_this() == player) { player->connection->send( - std::shared_ptr(new ChatPacket( - name, ChatPacket::e_ChatPlayerMaxSquid))); + std::make_shared( + name, ChatPacket::e_ChatPlayerMaxSquid)); } } break; @@ -1363,8 +1363,8 @@ void ServerPlayer::displayClientMessage(int messageId) { server->getPlayers()->players[i]; if (shared_from_this() == player) { player->connection->send( - std::shared_ptr(new ChatPacket( - name, ChatPacket::e_ChatPlayerMaxWolves))); + std::make_shared( + name, ChatPacket::e_ChatPlayerMaxWolves)); } } break; @@ -1375,8 +1375,8 @@ void ServerPlayer::displayClientMessage(int messageId) { server->getPlayers()->players[i]; if (shared_from_this() == player) { player->connection->send( - std::shared_ptr(new ChatPacket( - name, ChatPacket::e_ChatPlayerMaxMooshrooms))); + std::make_shared( + name, ChatPacket::e_ChatPlayerMaxMooshrooms)); } } break; @@ -1387,8 +1387,8 @@ void ServerPlayer::displayClientMessage(int messageId) { server->getPlayers()->players[i]; if (shared_from_this() == player) { player->connection->send( - std::shared_ptr(new ChatPacket( - name, ChatPacket::e_ChatPlayerMaxEnemies))); + std::make_shared( + name, ChatPacket::e_ChatPlayerMaxEnemies)); } } break; @@ -1400,8 +1400,8 @@ void ServerPlayer::displayClientMessage(int messageId) { server->getPlayers()->players[i]; if (shared_from_this() == player) { player->connection->send( - std::shared_ptr(new ChatPacket( - name, ChatPacket::e_ChatPlayerMaxVillagers))); + std::make_shared( + name, ChatPacket::e_ChatPlayerMaxVillagers)); } } break; @@ -1412,9 +1412,9 @@ void ServerPlayer::displayClientMessage(int messageId) { server->getPlayers()->players[i]; if (shared_from_this() == player) { player->connection->send( - std::shared_ptr(new ChatPacket( + std::make_shared( name, - ChatPacket::e_ChatPlayerMaxBredPigsSheepCows))); + ChatPacket::e_ChatPlayerMaxBredPigsSheepCows)); } } break; @@ -1425,8 +1425,8 @@ void ServerPlayer::displayClientMessage(int messageId) { server->getPlayers()->players[i]; if (shared_from_this() == player) { player->connection->send( - std::shared_ptr(new ChatPacket( - name, ChatPacket::e_ChatPlayerMaxBredChickens))); + std::make_shared( + name, ChatPacket::e_ChatPlayerMaxBredChickens)); } } break; @@ -1437,8 +1437,8 @@ void ServerPlayer::displayClientMessage(int messageId) { server->getPlayers()->players[i]; if (shared_from_this() == player) { player->connection->send( - std::shared_ptr(new ChatPacket( - name, ChatPacket::e_ChatPlayerMaxBredMooshrooms))); + std::make_shared( + name, ChatPacket::e_ChatPlayerMaxBredMooshrooms)); } } break; @@ -1450,8 +1450,8 @@ void ServerPlayer::displayClientMessage(int messageId) { server->getPlayers()->players[i]; if (shared_from_this() == player) { player->connection->send( - std::shared_ptr(new ChatPacket( - name, ChatPacket::e_ChatPlayerMaxBredWolves))); + std::make_shared( + name, ChatPacket::e_ChatPlayerMaxBredWolves)); } } break; @@ -1463,8 +1463,8 @@ void ServerPlayer::displayClientMessage(int messageId) { server->getPlayers()->players[i]; if (shared_from_this() == player) { player->connection->send( - std::shared_ptr(new ChatPacket( - name, ChatPacket::e_ChatPlayerCantShearMooshroom))); + std::make_shared( + name, ChatPacket::e_ChatPlayerCantShearMooshroom)); } } break; @@ -1476,8 +1476,8 @@ void ServerPlayer::displayClientMessage(int messageId) { server->getPlayers()->players[i]; if (shared_from_this() == player) { player->connection->send( - std::shared_ptr(new ChatPacket( - name, ChatPacket::e_ChatPlayerMaxHangingEntities))); + std::make_shared( + name, ChatPacket::e_ChatPlayerMaxHangingEntities)); } } break; @@ -1488,9 +1488,9 @@ void ServerPlayer::displayClientMessage(int messageId) { server->getPlayers()->players[i]; if (shared_from_this() == player) { player->connection->send( - std::shared_ptr(new ChatPacket( + std::make_shared( name, - ChatPacket::e_ChatPlayerCantSpawnInPeaceful))); + ChatPacket::e_ChatPlayerCantSpawnInPeaceful)); } } break; @@ -1502,8 +1502,8 @@ void ServerPlayer::displayClientMessage(int messageId) { server->getPlayers()->players[i]; if (shared_from_this() == player) { player->connection->send( - std::shared_ptr(new ChatPacket( - name, ChatPacket::e_ChatPlayerMaxBoats))); + std::make_shared( + name, ChatPacket::e_ChatPlayerMaxBoats)); } } break; @@ -1577,14 +1577,14 @@ void ServerPlayer::teleportTo(double x, double y, double z) { void ServerPlayer::crit(std::shared_ptr entity) { getLevel()->getTracker()->broadcastAndSend( - shared_from_this(), std::shared_ptr(new AnimatePacket( - entity, AnimatePacket::CRITICAL_HIT))); + shared_from_this(), std::make_shared( + entity, AnimatePacket::CRITICAL_HIT)); } void ServerPlayer::magicCrit(std::shared_ptr entity) { getLevel()->getTracker()->broadcastAndSend( - shared_from_this(), std::shared_ptr(new AnimatePacket( - entity, AnimatePacket::MAGIC_CRITICAL_HIT))); + shared_from_this(), std::make_shared( + entity, AnimatePacket::MAGIC_CRITICAL_HIT)); } void ServerPlayer::onUpdateAbilities() { diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.cpp index 272d03c00..f9a25c177 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.cpp @@ -66,8 +66,8 @@ void TrackedEntity::tick(EntityTracker* tracker, (e->riding != nullptr && tickCount % (SharedConstants::TICKS_PER_SECOND * 3) == 0)) { lastRidingEntity = e->riding; - broadcast(std::shared_ptr(new SetEntityLinkPacket( - SetEntityLinkPacket::RIDING, e, e->riding))); + broadcast(std::make_shared( + SetEntityLinkPacket::RIDING, e, e->riding)); } // Moving forward special case for item frames @@ -304,8 +304,8 @@ void TrackedEntity::tick(EntityTracker* tracker, if (rot) { // 4J: Changed this to use deltas broadcast( - std::shared_ptr(new MoveEntityPacket::Rot( - e->entityId, (uint8_t)yRota, (uint8_t)xRota))); + std::make_shared( + e->entityId, (uint8_t)yRota, (uint8_t)xRota)); yRotp = yRotn; xRotp = xRotn; } @@ -571,8 +571,8 @@ void TrackedEntity::updatePlayer(EntityTracker* tracker, // 4J Stu brought forward to fix when Item Frames if (!e->getEntityData()->isEmpty() && !isAddMobPacket) { sp->connection->send( - std::shared_ptr(new SetEntityDataPacket( - e->entityId, e->getEntityData(), true))); + std::make_shared( + e->entityId, e->getEntityData(), true)); } if (e->instanceof(eTYPE_LIVINGENTITY)) { @@ -597,15 +597,15 @@ void TrackedEntity::updatePlayer(EntityTracker* tracker, if (e->riding != nullptr) { sp->connection->send( - std::shared_ptr(new SetEntityLinkPacket( - SetEntityLinkPacket::RIDING, e, e->riding))); + std::make_shared( + SetEntityLinkPacket::RIDING, e, e->riding)); } if (e->instanceof(eTYPE_MOB) && std::dynamic_pointer_cast(e)->getLeashHolder() != nullptr) { sp->connection->send( - std::shared_ptr(new SetEntityLinkPacket( + std::make_shared( SetEntityLinkPacket::LEASH, e, - std::dynamic_pointer_cast(e)->getLeashHolder()))); + std::dynamic_pointer_cast(e)->getLeashHolder())); } if (e->instanceof(eTYPE_LIVINGENTITY)) { @@ -689,8 +689,8 @@ std::shared_ptr TrackedEntity::getAddEntityPacket() { if (e->instanceof(eTYPE_ITEMENTITY)) { std::shared_ptr packet = - std::shared_ptr(new AddEntityPacket( - e, AddEntityPacket::ITEM, 1, yRotp, xRotp, xp, yp, zp)); + std::make_shared( + e, AddEntityPacket::ITEM, 1, yRotp, xRotp, xp, yp, zp); return packet; } else if (e->instanceof(eTYPE_SERVERPLAYER)) { std::shared_ptr player = @@ -705,8 +705,8 @@ std::shared_ptr TrackedEntity::getAddEntityPacket() { // 4J Added yHeadRotp param to fix #102563 - TU12: Content: Gameplay: // When one of the Players is idle for a few minutes his head turns 180 // degrees. - return std::shared_ptr(new AddPlayerPacket( - player, xuid, OnlineXuid, xp, yp, zp, yRotp, xRotp, yHeadRotp)); + return std::make_shared( + player, xuid, OnlineXuid, xp, yp, zp, yRotp, xRotp, yHeadRotp); } else if (e->instanceof(eTYPE_MINECART)) { std::shared_ptr minecart = std::dynamic_pointer_cast(e); @@ -714,8 +714,8 @@ std::shared_ptr TrackedEntity::getAddEntityPacket() { new AddEntityPacket(e, AddEntityPacket::MINECART, minecart->getType(), yRotp, xRotp, xp, yp, zp)); } else if (e->instanceof(eTYPE_BOAT)) { - return std::shared_ptr(new AddEntityPacket( - e, AddEntityPacket::BOAT, yRotp, xRotp, xp, yp, zp)); + return std::make_shared( + e, AddEntityPacket::BOAT, yRotp, xRotp, xp, yp, zp); } else if (e->instanceof(eTYPE_ENDERDRAGON)) { yHeadRotp = Mth::floor(e->getYHeadRot() * 256 / 360); return std::shared_ptr( @@ -724,37 +724,37 @@ std::shared_ptr TrackedEntity::getAddEntityPacket() { } else if (e->instanceof(eTYPE_FISHINGHOOK)) { std::shared_ptr owner = std::dynamic_pointer_cast(e)->owner; - return std::shared_ptr(new AddEntityPacket( + return std::make_shared( e, AddEntityPacket::FISH_HOOK, owner != nullptr ? owner->entityId : e->entityId, yRotp, xRotp, xp, - yp, zp)); + yp, zp); } else if (e->instanceof(eTYPE_ARROW)) { std::shared_ptr owner = (std::dynamic_pointer_cast(e))->owner; - return std::shared_ptr(new AddEntityPacket( + return std::make_shared( e, AddEntityPacket::ARROW, owner != nullptr ? owner->entityId : e->entityId, yRotp, xRotp, xp, - yp, zp)); + yp, zp); } else if (e->instanceof(eTYPE_SNOWBALL)) { - return std::shared_ptr(new AddEntityPacket( - e, AddEntityPacket::SNOWBALL, yRotp, xRotp, xp, yp, zp)); + return std::make_shared( + e, AddEntityPacket::SNOWBALL, yRotp, xRotp, xp, yp, zp); } else if (e->instanceof(eTYPE_THROWNPOTION)) { - return std::shared_ptr(new AddEntityPacket( + return std::make_shared( e, AddEntityPacket::THROWN_POTION, ((std::dynamic_pointer_cast(e))->getPotionValue()), - yRotp, xRotp, xp, yp, zp)); + yRotp, xRotp, xp, yp, zp); } else if (e->instanceof(eTYPE_THROWNEXPBOTTLE)) { - return std::shared_ptr(new AddEntityPacket( - e, AddEntityPacket::THROWN_EXPBOTTLE, yRotp, xRotp, xp, yp, zp)); + return std::make_shared( + e, AddEntityPacket::THROWN_EXPBOTTLE, yRotp, xRotp, xp, yp, zp); } else if (e->instanceof(eTYPE_THROWNENDERPEARL)) { - return std::shared_ptr(new AddEntityPacket( - e, AddEntityPacket::THROWN_ENDERPEARL, yRotp, xRotp, xp, yp, zp)); + return std::make_shared( + e, AddEntityPacket::THROWN_ENDERPEARL, yRotp, xRotp, xp, yp, zp); } else if (e->instanceof(eTYPE_EYEOFENDERSIGNAL)) { - return std::shared_ptr(new AddEntityPacket( - e, AddEntityPacket::EYEOFENDERSIGNAL, yRotp, xRotp, xp, yp, zp)); + return std::make_shared( + e, AddEntityPacket::EYEOFENDERSIGNAL, yRotp, xRotp, xp, yp, zp); } else if (e->instanceof(eTYPE_FIREWORKS_ROCKET)) { - return std::shared_ptr(new AddEntityPacket( - e, AddEntityPacket::FIREWORKS, yRotp, xRotp, xp, yp, zp)); + return std::make_shared( + e, AddEntityPacket::FIREWORKS, yRotp, xRotp, xp, yp, zp); } else if (e->instanceof(eTYPE_FIREBALL)) { eINSTANCEOF classType = e->GetType(); int type = AddEntityPacket::FIREBALL; @@ -769,8 +769,8 @@ std::shared_ptr TrackedEntity::getAddEntityPacket() { std::shared_ptr fb = std::dynamic_pointer_cast(e); std::shared_ptr aep = nullptr; if (fb->owner != nullptr) { - aep = std::shared_ptr(new AddEntityPacket( - e, type, fb->owner->entityId, yRotp, xRotp, xp, yp, zp)); + aep = std::make_shared( + e, type, fb->owner->entityId, yRotp, xRotp, xp, yp, zp); } else { aep = std::shared_ptr( new AddEntityPacket(e, type, 0, yRotp, xRotp, xp, yp, zp)); @@ -780,20 +780,20 @@ std::shared_ptr TrackedEntity::getAddEntityPacket() { aep->za = (int)(fb->zPower * 8000); return aep; } else if (e->instanceof(eTYPE_THROWNEGG)) { - return std::shared_ptr(new AddEntityPacket( - e, AddEntityPacket::EGG, yRotp, xRotp, xp, yp, zp)); + return std::make_shared( + e, AddEntityPacket::EGG, yRotp, xRotp, xp, yp, zp); } else if (e->instanceof(eTYPE_PRIMEDTNT)) { - return std::shared_ptr(new AddEntityPacket( - e, AddEntityPacket::PRIMED_TNT, yRotp, xRotp, xp, yp, zp)); + return std::make_shared( + e, AddEntityPacket::PRIMED_TNT, yRotp, xRotp, xp, yp, zp); } else if (e->instanceof(eTYPE_ENDER_CRYSTAL)) { - return std::shared_ptr(new AddEntityPacket( - e, AddEntityPacket::ENDER_CRYSTAL, yRotp, xRotp, xp, yp, zp)); + return std::make_shared( + e, AddEntityPacket::ENDER_CRYSTAL, yRotp, xRotp, xp, yp, zp); } else if (e->instanceof(eTYPE_FALLINGTILE)) { std::shared_ptr ft = std::dynamic_pointer_cast(e); - return std::shared_ptr(new AddEntityPacket( + return std::make_shared( e, AddEntityPacket::FALLING, ft->tile | (ft->data << 16), yRotp, - xRotp, xp, yp, zp)); + xRotp, xp, yp, zp); } else if (e->instanceof(eTYPE_PAINTING)) { return std::shared_ptr( new AddPaintingPacket(std::dynamic_pointer_cast(e))); @@ -820,8 +820,8 @@ std::shared_ptr TrackedEntity::getAddEntityPacket() { std::shared_ptr knot = std::dynamic_pointer_cast(e); std::shared_ptr packet = - std::shared_ptr(new AddEntityPacket( - e, AddEntityPacket::LEASH_KNOT, yRotp, xRotp, xp, yp, zp)); + std::make_shared( + e, AddEntityPacket::LEASH_KNOT, yRotp, xRotp, xp, yp, zp); packet->x = Mth::floor((float)knot->xTile * 32); packet->y = Mth::floor((float)knot->yTile * 32); packet->z = Mth::floor((float)knot->zTile * 32); diff --git a/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.cpp b/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.cpp index 8a1a97902..c63e95177 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.cpp @@ -56,7 +56,7 @@ void PendingConnection::disconnect(DisconnectPacket::eDisconnectReason reason) { reason, _tick); app.DebugPrintf("Pending connection disconnect: %d\n", reason); connection->send( - std::shared_ptr(new DisconnectPacket(reason))); + std::make_shared(reason)); connection->sendAndQuit(); done = true; // } catch (Exception e) { diff --git a/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.cpp b/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.cpp index a9235a93c..5112f6644 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.cpp @@ -112,7 +112,7 @@ void PlayerConnection::disconnect(DisconnectPacket::eDisconnectReason reason) { // 4J Stu - Need to remove the player from the receiving list before their // socket is NULLed so that we can find another player on their system server->getPlayers()->removePlayerFromReceiving(player); - send(std::shared_ptr(new DisconnectPacket(reason))); + send(std::make_shared(reason)); connection->sendAndQuit(); // 4J-PB - removed, since it needs to be localised in the language the // client is in @@ -120,8 +120,8 @@ void PlayerConnection::disconnect(DisconnectPacket::eDisconnectReason reason) { // ChatPacket(L"§e" + player->name + L" left the game.") ) ); if (getWasKicked()) { server->getPlayers()->broadcastAll( - std::shared_ptr(new ChatPacket( - player->name, ChatPacket::e_ChatPlayerKickedFromGame))); + std::make_shared( + player->name, ChatPacket::e_ChatPlayerKickedFromGame)); } else { server->getPlayers()->broadcastAll(std::shared_ptr( new ChatPacket(player->name, ChatPacket::e_ChatPlayerLeftGame))); @@ -365,8 +365,8 @@ void PlayerConnection::teleport(double x, double y, double z, float yRot, // where it represents the bottom of the player bounding volume if (sendPacket) player->connection->send( - std::shared_ptr(new MovePlayerPacket::PosRot( - x, y + 1.62f, y, z, yRot, xRot, false, false))); + std::make_shared( + x, y + 1.62f, y, z, yRot, xRot, false, false)); } void PlayerConnection::handlePlayerAction( @@ -553,8 +553,8 @@ void PlayerConnection::onDisconnect(DisconnectPacket::eDisconnectReason reason, // ChatPacket(L"§e" + player->name + L" left the game.") ) ); if (getWasKicked()) { server->getPlayers()->broadcastAll( - std::shared_ptr(new ChatPacket( - player->name, ChatPacket::e_ChatPlayerKickedFromGame))); + std::make_shared( + player->name, ChatPacket::e_ChatPlayerKickedFromGame)); } else { server->getPlayers()->broadcastAll(std::shared_ptr( new ChatPacket(player->name, ChatPacket::e_ChatPlayerLeftGame))); @@ -1132,8 +1132,8 @@ void PlayerConnection::handleContainerClick( if (ItemInstance::matches(packet->item, clicked)) { // Yep, you sure did click what you claimed to click! player->connection->send( - std::shared_ptr(new ContainerAckPacket( - packet->containerId, packet->uid, true))); + std::make_shared( + packet->containerId, packet->uid, true)); player->ignoreSlotUpdateHack = true; player->containerMenu->broadcastChanges(); player->broadcastCarriedItem(); @@ -1142,8 +1142,8 @@ void PlayerConnection::handleContainerClick( // No, you clicked the wrong thing! expectedAcks[player->containerMenu->containerId] = packet->uid; player->connection->send( - std::shared_ptr(new ContainerAckPacket( - packet->containerId, packet->uid, false))); + std::make_shared( + packet->containerId, packet->uid, false)); player->containerMenu->setSynched(player, false); std::vector > items; @@ -1199,7 +1199,7 @@ void PlayerConnection::handleSetCreativeModeSlot( std::wstring id = std::wstring(buf); if (data == nullptr) { data = - std::shared_ptr(new MapItemSavedData(id)); + std::make_shared(id); } player->level->setSavedData(id, (std::shared_ptr)data); @@ -1364,9 +1364,9 @@ void PlayerConnection::handlePlayerInfo( Player::ePlayerGamePrivilege_CreativeMode)); serverPlayer->gameMode->setGameModeForPlayer(gameType); serverPlayer->connection->send( - std::shared_ptr(new GameEventPacket( + std::make_shared( GameEventPacket::CHANGE_GAME_MODE, - gameType->getId()))); + gameType->getId())); } else { #if !defined(_CONTENT_PACKAGE) wprintf(L"%ls already has game mode %d\n", @@ -1673,9 +1673,9 @@ void PlayerConnection::handleCraftItem( if (ingItemInst->getItem()->hasCraftingRemainingItem()) { // replace item with remaining result player->inventory->add( - std::shared_ptr(new ItemInstance( + std::make_shared( ingItemInst->getItem() - ->getCraftingRemainingItem()))); + ->getCraftingRemainingItem())); } } } diff --git a/minecraft/Minecraft.Client/net/minecraft/server/network/ServerConnection.cpp b/minecraft/Minecraft.Client/net/minecraft/server/network/ServerConnection.cpp index 6cd731fde..a3aafef25 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/network/ServerConnection.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/network/ServerConnection.cpp @@ -22,9 +22,9 @@ ServerConnection::~ServerConnection() {} // used to have void ServerConnection::NewIncomingSocket(Socket* socket) { std::shared_ptr unconnectedClient = - std::shared_ptr(new PendingConnection( + std::make_shared( server, socket, - L"Connection #" + _toString(connectionCounter++))); + L"Connection #" + _toString(connectionCounter++)); handleConnection(unconnectedClient); } diff --git a/minecraft/Minecraft.World/net/minecraft/commands/common/GiveItemCommand.cpp b/minecraft/Minecraft.World/net/minecraft/commands/common/GiveItemCommand.cpp index 90bc22cf5..8af59ef16 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/common/GiveItemCommand.cpp +++ b/minecraft/Minecraft.World/net/minecraft/commands/common/GiveItemCommand.cpp @@ -34,7 +34,7 @@ void GiveItemCommand::execute(std::shared_ptr source, std::shared_ptr player = getPlayer(uid); if (player != nullptr && item > 0 && Item::items[item] != nullptr) { std::shared_ptr itemInstance = - std::shared_ptr(new ItemInstance(item, amount, aux)); + std::make_shared(item, amount, aux); std::shared_ptr drop = player->drop(itemInstance); drop->throwTime = 0; // logAdminAction(source, L"commands.give.success", diff --git a/minecraft/Minecraft.World/net/minecraft/core/ItemDispenseBehaviors.cpp b/minecraft/Minecraft.World/net/minecraft/core/ItemDispenseBehaviors.cpp index 8f604e6fa..ce70fd7aa 100644 --- a/minecraft/Minecraft.World/net/minecraft/core/ItemDispenseBehaviors.cpp +++ b/minecraft/Minecraft.World/net/minecraft/core/ItemDispenseBehaviors.cpp @@ -50,24 +50,24 @@ std::shared_ptr ArrowDispenseBehavior::getProjectile( std::shared_ptr EggDispenseBehavior::getProjectile( Level* world, Position* position) { - return std::shared_ptr(new ThrownEgg( - world, position->getX(), position->getY(), position->getZ())); + return std::make_shared( + world, position->getX(), position->getY(), position->getZ()); } /* Snowball */ std::shared_ptr SnowballDispenseBehavior::getProjectile( Level* world, Position* position) { - return std::shared_ptr(new Snowball( - world, position->getX(), position->getY(), position->getZ())); + return std::make_shared( + world, position->getX(), position->getY(), position->getZ()); } /* Exp Bottle */ std::shared_ptr ExpBottleDispenseBehavior::getProjectile( Level* world, Position* position) { - return std::shared_ptr(new ThrownExpBottle( - world, position->getX(), position->getY(), position->getZ())); + return std::make_shared( + world, position->getX(), position->getY(), position->getZ()); } float ExpBottleDispenseBehavior::getUncertainty() { @@ -164,8 +164,8 @@ std::shared_ptr FireworksDispenseBehavior::execute( double spawnZ = source->getZ() + facing->getStepZ(); std::shared_ptr firework = - std::shared_ptr(new FireworksRocketEntity( - world, spawnX, spawnY, spawnZ, dispensed)); + std::make_shared( + world, spawnX, spawnY, spawnZ, dispensed); source->getWorld()->addEntity(firework); outcome = ACTIVATED_ITEM; @@ -348,7 +348,7 @@ std::shared_ptr EmptyBucketDispenseBehavior::execute( new ItemInstance(targetType))) < 0) { DefaultDispenseItemBehavior::dispense( source, - std::shared_ptr(new ItemInstance(targetType))); + std::make_shared(targetType)); } outcome = ACTIVATED_ITEM; diff --git a/minecraft/Minecraft.World/net/minecraft/network/Connection.cpp b/minecraft/Minecraft.World/net/minecraft/network/Connection.cpp index d0d5d1e83..60a19c4d9 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/Connection.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/Connection.cpp @@ -451,7 +451,7 @@ void Connection::tick() { // read and write threads don't timeout tickCount++; if (tickCount % 20 == 0) { - send(std::shared_ptr(new KeepAlivePacket())); + send(std::make_shared()); } // 4J Stu - 1.8.2 changed from 100 to 1000 diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddEntityPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/AddEntityPacket.h index 11a16de0b..c06912cd3 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddEntityPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/AddEntityPacket.h @@ -61,7 +61,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new AddEntityPacket()); + return std::make_shared(); } virtual int getId() { return 23; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddExperienceOrbPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/AddExperienceOrbPacket.h index 6c846b02f..96e1befe6 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddExperienceOrbPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/AddExperienceOrbPacket.h @@ -24,7 +24,7 @@ public: virtual int getEstimatedSize(); static std::shared_ptr create() { - return std::shared_ptr(new AddExperienceOrbPacket()); + return std::make_shared(); } virtual int getId() { return 26; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddGlobalEntityPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/AddGlobalEntityPacket.h index 0f33fe2a0..94a9ed294 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddGlobalEntityPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/AddGlobalEntityPacket.h @@ -27,7 +27,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new AddGlobalEntityPacket()); + return std::make_shared(); } virtual int getId() { return 71; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddMobPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/AddMobPacket.h index ddd99eec1..92177a139 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddMobPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/AddMobPacket.h @@ -39,7 +39,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new AddMobPacket()); + return std::make_shared(); } virtual int getId() { return 24; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddPaintingPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/AddPaintingPacket.h index 2291023d2..a6316792c 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddPaintingPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/AddPaintingPacket.h @@ -28,7 +28,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new AddPaintingPacket()); + return std::make_shared(); } virtual int getId() { return 25; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.h index c6a101494..04e134947 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.h @@ -48,7 +48,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new AddPlayerPacket()); + return std::make_shared(); } virtual int getId() { return 20; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AnimatePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/AnimatePacket.h index c4bddffe1..396e0afd7 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AnimatePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/AnimatePacket.h @@ -31,7 +31,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new AnimatePacket()); + return std::make_shared(); } virtual int getId() { return 18; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AwardStatPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/AwardStatPacket.h index f9ca1a202..3e652bd07 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AwardStatPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/AwardStatPacket.h @@ -30,7 +30,7 @@ public: virtual bool isAync(); static std::shared_ptr create() { - return std::shared_ptr(new AwardStatPacket()); + return std::make_shared(); } virtual int getId() { return 200; } diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.h index 3dcc7f131..dd05cb4c1 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.h @@ -35,7 +35,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new BlockRegionUpdatePacket()); + return std::make_shared(); } virtual int getId() { return 51; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ChatPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ChatPacket.h index 6156c73d2..9e0ebc533 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ChatPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ChatPacket.h @@ -148,7 +148,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new ChatPacket()); + return std::make_shared(); } virtual int getId() { return 3; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkTilesUpdatePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkTilesUpdatePacket.h index f7e533641..bdf1d76ec 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkTilesUpdatePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkTilesUpdatePacket.h @@ -33,7 +33,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new ChunkTilesUpdatePacket()); + return std::make_shared(); } virtual int getId() { return 52; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityAreaPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityAreaPacket.h index d9d9c9ba2..83e32dd81 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityAreaPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityAreaPacket.h @@ -30,7 +30,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new ChunkVisibilityAreaPacket()); + return std::make_shared(); } virtual int getId() { return 155; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityPacket.h index 9b81a46ad..4a7d4a025 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ChunkVisibilityPacket.h @@ -25,7 +25,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new ChunkVisibilityPacket()); + return std::make_shared(); } virtual int getId() { return 50; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ClientCommandPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ClientCommandPacket.h index a058ccaef..62772e41d 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ClientCommandPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ClientCommandPacket.h @@ -24,7 +24,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new ClientCommandPacket()); + return std::make_shared(); } virtual int getId() { return 205; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ComplexItemDataPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ComplexItemDataPacket.h index e24fcab47..d71e61c18 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ComplexItemDataPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ComplexItemDataPacket.h @@ -26,7 +26,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new ComplexItemDataPacket()); + return std::make_shared(); } virtual int getId() { return 131; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerAckPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerAckPacket.h index 100b9b36f..2a2de2397 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerAckPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerAckPacket.h @@ -26,7 +26,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new ContainerAckPacket()); + return std::make_shared(); } virtual int getId() { return 106; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerButtonClickPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerButtonClickPacket.h index 2f568a5ef..59fce6daf 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerButtonClickPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerButtonClickPacket.h @@ -22,7 +22,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new ContainerButtonClickPacket()); + return std::make_shared(); } virtual int getId() { return 108; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClickPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClickPacket.h index 8fee5538e..8670a8339 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClickPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClickPacket.h @@ -31,7 +31,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new ContainerClickPacket()); + return std::make_shared(); } virtual int getId() { return 102; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClosePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClosePacket.h index 8c542ca37..ca389e4b2 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClosePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerClosePacket.h @@ -21,7 +21,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new ContainerClosePacket()); + return std::make_shared(); } virtual int getId() { return 101; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.h index 69891296a..b4a014736 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.h @@ -54,7 +54,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new ContainerOpenPacket()); + return std::make_shared(); } virtual int getId() { return 100; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetContentPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetContentPacket.h index 4f70cf57a..2279c0c42 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetContentPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetContentPacket.h @@ -28,7 +28,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new ContainerSetContentPacket()); + return std::make_shared(); } virtual int getId() { return 104; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetDataPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetDataPacket.h index 113780129..6d5f2265f 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetDataPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetDataPacket.h @@ -23,7 +23,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new ContainerSetDataPacket()); + return std::make_shared(); } virtual int getId() { return 105; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetSlotPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetSlotPacket.h index 3f985bafc..3d878ae8b 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetSlotPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ContainerSetSlotPacket.h @@ -30,7 +30,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new ContainerSetSlotPacket()); + return std::make_shared(); } virtual int getId() { return 103; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/CraftItemPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/CraftItemPacket.h index 80372f286..120b634d0 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/CraftItemPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/CraftItemPacket.h @@ -24,7 +24,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new CraftItemPacket()); + return std::make_shared(); } virtual int getId() { return 150; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.h index c9a7356f4..e5109f2ed 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.h @@ -37,7 +37,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new CustomPayloadPacket()); + return std::make_shared(); } virtual int getId() { return 250; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/DebugOptionsPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/DebugOptionsPacket.h index 7962657ea..04564c443 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/DebugOptionsPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/DebugOptionsPacket.h @@ -24,7 +24,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new DebugOptionsPacket()); + return std::make_shared(); } virtual int getId() { return 152; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h index 9d0702920..2c4fa45f7 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h @@ -57,7 +57,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new DisconnectPacket()); + return std::make_shared(); } virtual int getId() { return 255; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/EntityActionAtPositionPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/EntityActionAtPositionPacket.h index 9be4f5b4a..f942193a2 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/EntityActionAtPositionPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/EntityActionAtPositionPacket.h @@ -25,7 +25,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new EntityActionAtPositionPacket()); + return std::make_shared(); } virtual int getId() { return 17; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/EntityEventPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/EntityEventPacket.h index 6301a64e0..144bdddf8 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/EntityEventPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/EntityEventPacket.h @@ -23,7 +23,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new EntityEventPacket()); + return std::make_shared(); } virtual int getId() { return 38; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ExplodePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ExplodePacket.h index 2371f3c14..ec2c04610 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ExplodePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ExplodePacket.h @@ -44,7 +44,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new ExplodePacket()); + return std::make_shared(); } virtual int getId() { return 60; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h index ede96b7aa..30b549efb 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h @@ -28,7 +28,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new GameCommandPacket()); + return std::make_shared(); } virtual int getId() { return 167; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/GameEventPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/GameEventPacket.h index 28f208d47..e2b6038e6 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/GameEventPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/GameEventPacket.h @@ -38,7 +38,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new GameEventPacket()); + return std::make_shared(); } virtual int getId() { return 70; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/GetInfoPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/GetInfoPacket.h index 77f0fd8b1..8d687bcad 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/GetInfoPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/GetInfoPacket.h @@ -15,7 +15,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new GetInfoPacket()); + return std::make_shared(); } virtual int getId() { return 254; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/InteractPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/InteractPacket.h index 88d1dbd03..927169a2c 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/InteractPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/InteractPacket.h @@ -23,7 +23,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new InteractPacket()); + return std::make_shared(); } virtual int getId() { return 7; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.h index cdb63f217..7c108ac23 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.h @@ -23,7 +23,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new KeepAlivePacket()); + return std::make_shared(); } virtual int getId() { return 0; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/KickPlayerPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/KickPlayerPacket.h index 71eb885c6..38e410fc3 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/KickPlayerPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/KickPlayerPacket.h @@ -21,7 +21,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new KickPlayerPacket()); + return std::make_shared(); } virtual int getId() { return 159; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/LevelEventPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/LevelEventPacket.h index b4f373401..f7de00d44 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/LevelEventPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/LevelEventPacket.h @@ -24,7 +24,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new LevelEventPacket()); + return std::make_shared(); } virtual int getId() { return 61; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/LevelParticlesPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/LevelParticlesPacket.h index a2e8e4635..988b6310c 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/LevelParticlesPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/LevelParticlesPacket.h @@ -42,7 +42,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new LevelParticlesPacket()); + return std::make_shared(); } virtual int getId() { return 63; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/LevelSoundPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/LevelSoundPacket.h index 40b16dfac..01bfa7e46 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/LevelSoundPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/LevelSoundPacket.h @@ -38,7 +38,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new LevelSoundPacket()); + return std::make_shared(); } virtual int getId() { return 62; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/LoginPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/LoginPacket.h index d11d47bcb..023d00b89 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/LoginPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/LoginPacket.h @@ -57,7 +57,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new LoginPacket()); + return std::make_shared(); } virtual int getId() { return 1; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacket.h index 0d0588b41..4a5670fa5 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacket.h @@ -29,7 +29,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new MoveEntityPacket()); + return std::make_shared(); } virtual int getId() { return 30; } }; @@ -45,7 +45,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new MoveEntityPacket::PosRot()); + return std::make_shared(); } virtual int getId() { return 33; } }; @@ -61,7 +61,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new MoveEntityPacket::Pos()); + return std::make_shared(); } virtual int getId() { return 31; } }; @@ -77,7 +77,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new MoveEntityPacket::Rot()); + return std::make_shared(); } virtual int getId() { return 32; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacketSmall.h b/minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacketSmall.h index 2fde72491..701fef708 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacketSmall.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/MoveEntityPacketSmall.h @@ -30,7 +30,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new MoveEntityPacketSmall()); + return std::make_shared(); } virtual int getId() { return 162; } }; @@ -46,7 +46,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new MoveEntityPacketSmall::PosRot()); + return std::make_shared(); } virtual int getId() { return 165; } }; @@ -62,7 +62,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new MoveEntityPacketSmall::Pos()); + return std::make_shared(); } virtual int getId() { return 163; } }; @@ -78,7 +78,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new MoveEntityPacketSmall::Rot()); + return std::make_shared(); } virtual int getId() { return 164; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/MovePlayerPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/MovePlayerPacket.h index 2e2343a4d..a0dbd2688 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/MovePlayerPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/MovePlayerPacket.h @@ -30,7 +30,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new MovePlayerPacket()); + return std::make_shared(); } virtual int getId() { return 10; } }; @@ -47,7 +47,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new MovePlayerPacket::PosRot()); + return std::make_shared(); } virtual int getId() { return 13; } }; @@ -64,7 +64,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new MovePlayerPacket::Pos()); + return std::make_shared(); } virtual int getId() { return 11; } }; @@ -80,7 +80,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new MovePlayerPacket::Rot()); + return std::make_shared(); } virtual int getId() { return 12; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/Packet.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/Packet.cpp index b1ff11713..9a7b335ef 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/Packet.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/Packet.cpp @@ -671,7 +671,7 @@ std::shared_ptr Packet::readItem(DataInputStream* dis) { int damage = dis->readShort(); item = - std::shared_ptr(new ItemInstance(id, count, damage)); + std::make_shared(id, count, damage); // 4J Stu - Always read/write the tag // if (Item.items[id].canBeDepleted() || // Item.items[id].shouldOverrideMultiplayerNBT()) diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerAbilitiesPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerAbilitiesPacket.h index 28d41384c..f73e73fe1 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerAbilitiesPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerAbilitiesPacket.h @@ -49,7 +49,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new PlayerAbilitiesPacket()); + return std::make_shared(); } virtual int getId() { return 202; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerActionPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerActionPacket.h index 32607fa52..aa80ce384 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerActionPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerActionPacket.h @@ -28,7 +28,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new PlayerActionPacket()); + return std::make_shared(); } virtual int getId() { return 14; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerCommandPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerCommandPacket.h index 9d3437f6d..a334aaa75 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerCommandPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerCommandPacket.h @@ -43,7 +43,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new PlayerCommandPacket()); + return std::make_shared(); } virtual int getId() { return 19; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.h index 35d7c1ff4..18d08c581 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.h @@ -33,7 +33,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new PlayerInfoPacket()); + return std::make_shared(); } virtual int getId() { return 201; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInputPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInputPacket.h index 20bae70a3..3e933282b 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInputPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInputPacket.h @@ -31,7 +31,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new PlayerInputPacket()); + return std::make_shared(); } virtual int getId() { return 27; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PreLoginPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/PreLoginPacket.h index 61db780e3..1ef98c56e 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PreLoginPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/PreLoginPacket.h @@ -51,7 +51,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new PreLoginPacket()); + return std::make_shared(); } virtual int getId() { return 2; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveEntitiesPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveEntitiesPacket.h index 900f4a61d..6f3197606 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveEntitiesPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveEntitiesPacket.h @@ -27,7 +27,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new RemoveEntitiesPacket()); + return std::make_shared(); } virtual int getId() { return 29; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveMobEffectPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveMobEffectPacket.h index c5cbf3208..8d864f193 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveMobEffectPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/RemoveMobEffectPacket.h @@ -24,7 +24,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new RemoveMobEffectPacket()); + return std::make_shared(); } virtual int getId() { return 42; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/RespawnPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/RespawnPacket.h index 93edb7e74..7f592a11a 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/RespawnPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/RespawnPacket.h @@ -36,7 +36,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new RespawnPacket()); + return std::make_shared(); } virtual int getId() { return 9; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/RotateHeadPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/RotateHeadPacket.h index 2c4c015b9..24f78d194 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/RotateHeadPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/RotateHeadPacket.h @@ -26,7 +26,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new RotateHeadPacket()); + return std::make_shared(); } virtual int getId() { return 35; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/ServerSettingsChangedPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/ServerSettingsChangedPacket.h index 04ed57fc2..854f4e824 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/ServerSettingsChangedPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/ServerSettingsChangedPacket.h @@ -29,7 +29,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new ServerSettingsChangedPacket()); + return std::make_shared(); } virtual int getId() { return 153; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetCarriedItemPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/SetCarriedItemPacket.h index 68c91ba57..2ed53ef01 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetCarriedItemPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetCarriedItemPacket.h @@ -23,7 +23,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new SetCarriedItemPacket()); + return std::make_shared(); } virtual int getId() { return 16; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetCreativeModeSlotPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/SetCreativeModeSlotPacket.h index 8b8019fa1..3f87d9068 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetCreativeModeSlotPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetCreativeModeSlotPacket.h @@ -24,7 +24,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new SetCreativeModeSlotPacket()); + return std::make_shared(); } virtual int getId() { return 107; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetDisplayObjectivePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/SetDisplayObjectivePacket.h index 453dcee89..4e3edd4a1 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetDisplayObjectivePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetDisplayObjectivePacket.h @@ -25,7 +25,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new SetDisplayObjectivePacket()); + return std::make_shared(); } virtual int getId() { return 208; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityDataPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityDataPacket.h index 49f9e3de5..7652ee1bc 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityDataPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityDataPacket.h @@ -32,7 +32,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new SetEntityDataPacket()); + return std::make_shared(); } virtual int getId() { return 40; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityLinkPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityLinkPacket.h index 667090f3c..9a38e9995 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityLinkPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityLinkPacket.h @@ -30,7 +30,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new SetEntityLinkPacket()); + return std::make_shared(); } virtual int getId() { return 39; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityMotionPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityMotionPacket.h index cfd6aa55a..a60bdaf50 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityMotionPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetEntityMotionPacket.h @@ -32,7 +32,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new SetEntityMotionPacket()); + return std::make_shared(); } virtual int getId() { return 28; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEquippedItemPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/SetEquippedItemPacket.h index 869b7befb..d7328b6a8 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetEquippedItemPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetEquippedItemPacket.h @@ -38,7 +38,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new SetEquippedItemPacket()); + return std::make_shared(); } virtual int getId() { return 5; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetExperiencePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/SetExperiencePacket.h index 808e22c1d..f9da972b4 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetExperiencePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetExperiencePacket.h @@ -26,7 +26,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new SetExperiencePacket()); + return std::make_shared(); } virtual int getId() { return 43; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetHealthPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/SetHealthPacket.h index 791868e2a..4a288aaaa 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetHealthPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetHealthPacket.h @@ -28,7 +28,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new SetHealthPacket()); + return std::make_shared(); } virtual int getId() { return 8; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetObjectivePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/SetObjectivePacket.h index 29264ebf5..cd182fa80 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetObjectivePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetObjectivePacket.h @@ -29,7 +29,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new SetObjectivePacket()); + return std::make_shared(); } virtual int getId() { return 206; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetPlayerTeamPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/SetPlayerTeamPacket.h index bb028b81d..873d3b263 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetPlayerTeamPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetPlayerTeamPacket.h @@ -39,7 +39,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new SetPlayerTeamPacket()); + return std::make_shared(); } virtual int getId() { return 209; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetScorePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/SetScorePacket.h index 27bedf743..9f296a8ff 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetScorePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetScorePacket.h @@ -30,7 +30,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new SetScorePacket()); + return std::make_shared(); } virtual int getId() { return 207; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetSpawnPositionPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/SetSpawnPositionPacket.h index 35a0d20ca..fa0bb30c6 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetSpawnPositionPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetSpawnPositionPacket.h @@ -24,7 +24,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new SetSpawnPositionPacket()); + return std::make_shared(); } virtual int getId() { return 6; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SetTimePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/SetTimePacket.h index dd9265625..e8a90c0fd 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SetTimePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SetTimePacket.h @@ -25,7 +25,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new SetTimePacket()); + return std::make_shared(); } virtual int getId() { return 4; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/SignUpdatePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/SignUpdatePacket.h index c9dbc8dd9..1312dff61 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/SignUpdatePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/SignUpdatePacket.h @@ -26,7 +26,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new SignUpdatePacket()); + return std::make_shared(); } virtual int getId() { return 130; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TakeItemEntityPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/TakeItemEntityPacket.h index 4a202d0ae..4ce4647a3 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TakeItemEntityPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TakeItemEntityPacket.h @@ -21,7 +21,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new TakeItemEntityPacket()); + return std::make_shared(); } virtual int getId() { return 22; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TeleportEntityPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/TeleportEntityPacket.h index 221f83850..cf78b8efa 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TeleportEntityPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TeleportEntityPacket.h @@ -30,7 +30,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new TeleportEntityPacket()); + return std::make_shared(); } virtual int getId() { return 34; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryChangePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryChangePacket.h index d9e7e20b2..2d2b569c2 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryChangePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryChangePacket.h @@ -27,7 +27,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new TextureAndGeometryChangePacket()); + return std::make_shared(); } virtual int getId() { return 161; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.h index 21ea4cce9..09b101993 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.h @@ -42,7 +42,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new TextureAndGeometryPacket()); + return std::make_shared(); } virtual int getId() { return 160; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureChangePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/TextureChangePacket.h index 4f749b8e6..522cdbd37 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureChangePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TextureChangePacket.h @@ -32,7 +32,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new TextureChangePacket()); + return std::make_shared(); } virtual int getId() { return 157; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TexturePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/TexturePacket.h index 4a9d474d1..a54c715d2 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TexturePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TexturePacket.h @@ -25,7 +25,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new TexturePacket()); + return std::make_shared(); } virtual int getId() { return 154; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TileDestructionPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/TileDestructionPacket.h index 3f907a93e..fdcf66880 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TileDestructionPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TileDestructionPacket.h @@ -35,7 +35,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new TileDestructionPacket()); + return std::make_shared(); } virtual int getId() { return 55; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TileEditorOpenPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/TileEditorOpenPacket.h index 3b855b51c..c92030911 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TileEditorOpenPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TileEditorOpenPacket.h @@ -25,7 +25,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new TileEditorOpenPacket()); + return std::make_shared(); } virtual int getId() { return 133; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TileEntityDataPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/TileEntityDataPacket.h index 36665a335..57382cca3 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TileEntityDataPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TileEntityDataPacket.h @@ -35,7 +35,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new TileEntityDataPacket()); + return std::make_shared(); } virtual int getId() { return 132; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TileEventPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/TileEventPacket.h index ba22b286e..49035ac29 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TileEventPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TileEventPacket.h @@ -20,7 +20,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new TileEventPacket()); + return std::make_shared(); } virtual int getId() { return 54; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TileUpdatePacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/TileUpdatePacket.h index 4fdefc18c..62d66558c 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TileUpdatePacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TileUpdatePacket.h @@ -24,7 +24,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new TileUpdatePacket()); + return std::make_shared(); } virtual int getId() { return 53; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TradeItemPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/TradeItemPacket.h index 2300caa90..53e129d3c 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TradeItemPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TradeItemPacket.h @@ -26,7 +26,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new TradeItemPacket()); + return std::make_shared(); } virtual int getId() { return 151; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateAttributesPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateAttributesPacket.h index 231eed350..735041ab4 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateAttributesPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateAttributesPacket.h @@ -49,7 +49,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new UpdateAttributesPacket()); + return std::make_shared(); } virtual int getId() { return 44; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.h index d0a5e631e..df80d5ea5 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.h @@ -32,7 +32,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new UpdateGameRuleProgressPacket()); + return std::make_shared(); } virtual int getId() { return 158; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateMobEffectPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateMobEffectPacket.h index e301dcf59..ee5b273b6 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateMobEffectPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateMobEffectPacket.h @@ -29,7 +29,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new UpdateMobEffectPacket()); + return std::make_shared(); } virtual int getId() { return 41; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateProgressPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateProgressPacket.h index 606cb7c79..39a5f4279 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateProgressPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateProgressPacket.h @@ -24,7 +24,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new UpdateProgressPacket()); + return std::make_shared(); } virtual int getId() { return 156; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/UseItemPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/UseItemPacket.h index 53250f074..feeab592f 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/UseItemPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/UseItemPacket.h @@ -37,7 +37,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new UseItemPacket()); + return std::make_shared(); } virtual int getId() { return 15; } }; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/XZPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/XZPacket.h index d64f0ecc2..dbd26f66a 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/XZPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/XZPacket.h @@ -26,7 +26,7 @@ public: public: static std::shared_ptr create() { - return std::shared_ptr(new XZPacket()); + return std::make_shared(); } virtual int getId() { return 166; } }; \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/util/WeighedTreasure.cpp b/minecraft/Minecraft.World/net/minecraft/util/WeighedTreasure.cpp index bd4a7eabc..b89f9a733 100644 --- a/minecraft/Minecraft.World/net/minecraft/util/WeighedTreasure.cpp +++ b/minecraft/Minecraft.World/net/minecraft/util/WeighedTreasure.cpp @@ -8,7 +8,7 @@ WeighedTreasure::WeighedTreasure(int itemId, int auxValue, int minCount, int maxCount, int weight) : WeighedRandomItem(weight) { this->item = - std::shared_ptr(new ItemInstance(itemId, 1, auxValue)); + std::make_shared(itemId, 1, auxValue); this->minCount = minCount; this->maxCount = maxCount; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatTracker.cpp b/minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatTracker.cpp index aa713ba43..d86673a3d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatTracker.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/damageSource/CombatTracker.cpp @@ -105,16 +105,16 @@ std::shared_ptr CombatTracker::getDeathMessagePacket() { : nullptr; if (attackerItem != nullptr && attackerItem->hasCustomHoverName()) { - result = std::shared_ptr(new ChatPacket( + result = std::make_shared( mob->getNetworkName(), ChatPacket::e_ChatDeathFellAssistItem, attackerEntity->GetType(), attackerEntity->getNetworkName(), - attackerItem->getHoverName())); + attackerItem->getHoverName()); } else { - result = std::shared_ptr(new ChatPacket( + result = std::make_shared( mob->getNetworkName(), ChatPacket::e_ChatDeathFellAssist, attackerEntity->GetType(), - attackerEntity->getNetworkName())); + attackerEntity->getNetworkName()); } } else if (killingEntity != nullptr) { std::shared_ptr killerItem = @@ -123,19 +123,19 @@ std::shared_ptr CombatTracker::getDeathMessagePacket() { ->getCarriedItem() : nullptr; if (killerItem != nullptr && killerItem->hasCustomHoverName()) { - result = std::shared_ptr(new ChatPacket( + result = std::make_shared( mob->getNetworkName(), ChatPacket::e_ChatDeathFellFinishItem, killingEntity->GetType(), killingEntity->getNetworkName(), - killerItem->getHoverName())); + killerItem->getHoverName()); } else { - result = std::shared_ptr(new ChatPacket( + result = std::make_shared( mob->getNetworkName(), ChatPacket::e_ChatDeathFellFinish, - killingEntity->GetType(), killingEntity->getNetworkName())); + killingEntity->GetType(), killingEntity->getNetworkName()); } } else { - result = std::shared_ptr(new ChatPacket( - mob->getNetworkName(), ChatPacket::e_ChatDeathFellKiller)); + result = std::make_shared( + mob->getNetworkName(), ChatPacket::e_ChatDeathFellKiller); } } else { result = killingBlow->getSource()->getDeathMessagePacket( diff --git a/minecraft/Minecraft.World/net/minecraft/world/damageSource/DamageSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/damageSource/DamageSource.cpp index 19be28935..63bc3bb27 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/damageSource/DamageSource.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/damageSource/DamageSource.cpp @@ -214,11 +214,11 @@ std::shared_ptr DamageSource::getDeathMessagePacket( std::shared_ptr player) { std::shared_ptr source = player->getKillCredit(); if (source != nullptr) { - return std::shared_ptr(new ChatPacket( + return std::make_shared( player->getNetworkName(), m_msgWithItemId != ChatPacket::e_ChatCustom ? m_msgWithItemId : m_msgId, - source->GetType(), source->getNetworkName())); + source->GetType(), source->getNetworkName()); } else { return std::shared_ptr( new ChatPacket(player->getNetworkName(), m_msgId)); diff --git a/minecraft/Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.cpp index e6a882eb1..cdf07795c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/damageSource/EntityDamageSource.cpp @@ -49,12 +49,12 @@ std::shared_ptr EntityDamageSource::getDeathMessagePacket( } if ((held != nullptr) && held->hasCustomHoverName()) { - return std::shared_ptr(new ChatPacket( + return std::make_shared( player->getNetworkName(), m_msgWithItemId, entity->GetType(), - additional, held->getHoverName())); + additional, held->getHoverName()); } else { - return std::shared_ptr(new ChatPacket( - player->getNetworkName(), m_msgId, entity->GetType(), additional)); + return std::make_shared( + player->getNetworkName(), m_msgId, entity->GetType(), additional); } } diff --git a/minecraft/Minecraft.World/net/minecraft/world/damageSource/IndirectEntityDamageSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/damageSource/IndirectEntityDamageSource.cpp index 95ba1a84f..64b991ec1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/damageSource/IndirectEntityDamageSource.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/damageSource/IndirectEntityDamageSource.cpp @@ -62,8 +62,8 @@ std::shared_ptr IndirectEntityDamageSource::getDeathMessagePacket( new ChatPacket(player->getNetworkName(), m_msgWithItemId, type, additional, held->getHoverName())); } else { - return std::shared_ptr(new ChatPacket( - player->getNetworkName(), m_msgId, type, additional)); + return std::make_shared( + player->getNetworkName(), m_msgId, type, additional); } } diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.cpp index 6c3305737..ac0316098 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.cpp @@ -334,7 +334,7 @@ void Entity::_init(bool useSmallId, Level* level) { // values that need to be sent to clients in SMP if (useSmallId) { entityData = - std::shared_ptr(new SynchedEntityData()); + std::make_shared(); } else { entityData = nullptr; } @@ -1406,7 +1406,7 @@ std::shared_ptr Entity::spawnAtLocation(int resource, int count) { std::shared_ptr Entity::spawnAtLocation(int resource, int count, float yOffs) { return spawnAtLocation( - std::shared_ptr(new ItemInstance(resource, count, 0)), + std::make_shared(resource, count, 0), yOffs); } diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ItemFrame.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ItemFrame.cpp index ac1686e55..4e72c10ec 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ItemFrame.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ItemFrame.cpp @@ -55,7 +55,7 @@ void ItemFrame::dropItem(std::shared_ptr causedBy) { } spawnAtLocation( - std::shared_ptr(new ItemInstance(Item::frame)), 0); + std::make_shared(Item::frame), 0); if ((item != nullptr) && (random->nextFloat() < dropChance)) { item = item->copy(); removeFramedMap(item); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/LivingEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/LivingEntity.cpp index 14898d007..a9b2efec8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/LivingEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/LivingEntity.cpp @@ -1094,8 +1094,8 @@ void LivingEntity::swing() { ((ServerLevel*)level) ->getTracker() ->broadcast(shared_from_this(), - std::shared_ptr(new AnimatePacket( - shared_from_this(), AnimatePacket::SWING))); + std::make_shared( + shared_from_this(), AnimatePacket::SWING)); } } } diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.cpp index 1cd5e1a53..bac1b81e4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.cpp @@ -830,8 +830,8 @@ void Mob::dropLeash(bool synch, bool createItemDrop) { if (!level->isClientSide && synch && serverLevel != nullptr) { serverLevel->getTracker()->broadcast( shared_from_this(), - std::shared_ptr(new SetEntityLinkPacket( - SetEntityLinkPacket::LEASH, shared_from_this(), nullptr))); + std::make_shared( + SetEntityLinkPacket::LEASH, shared_from_this(), nullptr)); } } } @@ -852,8 +852,8 @@ void Mob::setLeashedTo(std::shared_ptr holder, bool synch) { if (!level->isClientSide && synch && serverLevel) { serverLevel->getTracker()->broadcast( shared_from_this(), - std::shared_ptr(new SetEntityLinkPacket( - SetEntityLinkPacket::LEASH, shared_from_this(), leashHolder))); + std::make_shared( + SetEntityLinkPacket::LEASH, shared_from_this(), leashHolder)); } } diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/Painting.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/Painting.cpp index c3b355d8b..31830690d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/Painting.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/Painting.cpp @@ -147,5 +147,5 @@ void Painting::dropItem(std::shared_ptr causedBy) { } spawnAtLocation( - std::shared_ptr(new ItemInstance(Item::painting)), 0.0f); + std::make_shared(Item::painting), 0.0f); } \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/SyncedEntityData.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/SyncedEntityData.cpp index 073bb0697..a388ee5f5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/SyncedEntityData.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/SyncedEntityData.cpp @@ -17,7 +17,7 @@ void SynchedEntityData::define(int id, int value) { checkId(id); int type = TYPE_INT; std::shared_ptr dataItem = - std::shared_ptr(new DataItem(type, id, value)); + std::make_shared(type, id, value); itemsById[id] = dataItem; m_isEmpty = false; } @@ -26,7 +26,7 @@ void SynchedEntityData::define(int id, uint8_t value) { checkId(id); int type = TYPE_BYTE; std::shared_ptr dataItem = - std::shared_ptr(new DataItem(type, id, value)); + std::make_shared(type, id, value); itemsById[id] = dataItem; m_isEmpty = false; } @@ -35,7 +35,7 @@ void SynchedEntityData::define(int id, short value) { checkId(id); int type = TYPE_SHORT; std::shared_ptr dataItem = - std::shared_ptr(new DataItem(type, id, value)); + std::make_shared(type, id, value); itemsById[id] = dataItem; m_isEmpty = false; } @@ -44,7 +44,7 @@ void SynchedEntityData::define(int id, float value) { checkId(id); int type = TYPE_FLOAT; std::shared_ptr dataItem = - std::shared_ptr(new DataItem(type, id, value)); + std::make_shared(type, id, value); itemsById[id] = dataItem; m_isEmpty = false; } @@ -53,7 +53,7 @@ void SynchedEntityData::define(int id, const std::wstring& value) { checkId(id); int type = TYPE_STRING; std::shared_ptr dataItem = - std::shared_ptr(new DataItem(type, id, value)); + std::make_shared(type, id, value); itemsById[id] = dataItem; m_isEmpty = false; } @@ -320,9 +320,9 @@ SynchedEntityData::unpack(DataInputStream* input) // throws IOException } break; case TYPE_STRING: - item = std::shared_ptr(new DataItem( + item = std::make_shared( itemType, itemId, - Packet::readUtf(input, MAX_STRING_DATA_LENGTH))); + Packet::readUtf(input, MAX_STRING_DATA_LENGTH)); break; case TYPE_ITEMINSTANCE: { item = std::shared_ptr( diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.cpp index b89d9062d..490254cc7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.cpp @@ -128,6 +128,6 @@ void BreedGoal::breed() { } // 4J-PB - Fix for 106869- Customer Encountered: TU12: Content: Gameplay: // Breeding animals does not give any Experience Orbs. - level->addEntity(std::shared_ptr(new ExperienceOrb( - level, animal->x, animal->y, animal->z, random->nextInt(7) + 1))); + level->addEntity(std::make_shared( + level, animal->x, animal->y, animal->z, random->nextInt(7) + 1)); } diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Village.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Village.cpp index 59deefd18..db9724190 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Village.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Village.cpp @@ -77,7 +77,7 @@ void Village::tick(int tick) { findRandomSpawnPos(center->x, center->y, center->z, 2, 4, 2); if (spawnPos.has_value()) { std::shared_ptr vg = - std::shared_ptr(new VillagerGolem(level)); + std::make_shared(level); vg->setPos(spawnPos->x, spawnPos->y, spawnPos->z); level->addEntity(vg); ++golemCount; @@ -393,9 +393,9 @@ void Village::readAdditionalSaveData(CompoundTag* tag) { for (int i = 0; i < doorTags->size(); i++) { CompoundTag* dTag = doorTags->get(i); - std::shared_ptr door = std::shared_ptr(new DoorInfo( + std::shared_ptr door = std::make_shared( dTag->getInt(L"X"), dTag->getInt(L"Y"), dTag->getInt(L"Z"), - dTag->getInt(L"IDX"), dTag->getInt(L"IDZ"), dTag->getInt(L"TS"))); + dTag->getInt(L"IDX"), dTag->getInt(L"IDZ"), dTag->getInt(L"TS")); doorInfos.push_back(door); } diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/VillageSiege.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/VillageSiege.cpp index 2ac97a81a..86930bb76 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/VillageSiege.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/VillageSiege.cpp @@ -133,7 +133,7 @@ bool VillageSiege::trySpawn() { std::shared_ptr mob; // try { - mob = std::shared_ptr(new Zombie(level)); + mob = std::make_shared(level); mob->finalizeMobSpawn(nullptr); mob->setVillager(false); } diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Villages.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Villages.cpp index b0d44fe1c..b579fc5c8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Villages.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/village/Villages.cpp @@ -122,7 +122,7 @@ void Villages::cluster() { // create new Village std::shared_ptr village = - std::shared_ptr(new Village(level)); + std::make_shared(level); village->addDoorInfo(di); villages.push_back(village); setDirty(); @@ -207,7 +207,7 @@ void Villages::load(CompoundTag* tag) { for (int i = 0; i < villageTags->size(); i++) { CompoundTag* compoundTag = villageTags->get(i); std::shared_ptr village = - std::shared_ptr(new Village()); + std::make_shared(); village->readAdditionalSaveData(compoundTag); villages.push_back(village); } diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Chicken.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Chicken.cpp index b5db3e5bd..b0326851b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Chicken.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Chicken.cpp @@ -122,7 +122,7 @@ std::shared_ptr Chicken::getBreedOffspring( std::shared_ptr target) { // 4J - added limit to chickens that can be bred if (level->canCreateMore(GetType(), Level::eSpawnType_Breed)) { - return std::shared_ptr(new Chicken(level)); + return std::make_shared(level); } else { return nullptr; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Cow.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Cow.cpp index 964635fc9..3eba04b10 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Cow.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Cow.cpp @@ -111,7 +111,7 @@ std::shared_ptr Cow::getBreedOffspring( std::shared_ptr target) { // 4J - added limit to number of animals that can be bred if (level->canCreateMore(GetType(), Level::eSpawnType_Breed)) { - return std::shared_ptr(new Cow(level)); + return std::make_shared(level); } else { return nullptr; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.cpp index c15d9981a..f52c0e7d1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.cpp @@ -1287,7 +1287,7 @@ void EntityHorse::readAdditionalSaveData(CompoundTag* tag) { } else if (tag->getBoolean(L"Saddle")) { inventory->setItem( INV_SLOT_SADDLE, - std::shared_ptr(new ItemInstance(Item::saddle))); + std::make_shared(Item::saddle)); } updateEquipment(); } @@ -1314,7 +1314,7 @@ std::shared_ptr EntityHorse::getBreedOffspring( std::shared_ptr horsePartner = std::dynamic_pointer_cast(partner); std::shared_ptr baby = - std::shared_ptr(new EntityHorse(level)); + std::make_shared(level); int type = getType(); int partnerType = horsePartner->getType(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/MushroomCow.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/MushroomCow.cpp index 799708a32..f1a5b6834 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/MushroomCow.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/MushroomCow.cpp @@ -51,7 +51,7 @@ bool MushroomCow::mobInteract(std::shared_ptr player) { 0, 0, 0); if (!level->isClientSide) { remove(); - std::shared_ptr cow = std::shared_ptr(new Cow(level)); + std::shared_ptr cow = std::make_shared(level); cow->moveTo(x, y, z, yRot, xRot); cow->setHealth(getHealth()); cow->yBodyRot = yBodyRot; @@ -86,7 +86,7 @@ std::shared_ptr MushroomCow::getBreedOffspring( std::shared_ptr target) { // 4J - added limit to number of animals that can be bred if (level->canCreateMore(GetType(), Level::eSpawnType_Breed)) { - return std::shared_ptr(new MushroomCow(level)); + return std::make_shared(level); } else { return nullptr; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Ocelot.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Ocelot.cpp index 26ad65f2d..a166d4bf3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Ocelot.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Ocelot.cpp @@ -229,7 +229,7 @@ std::shared_ptr Ocelot::getBreedOffspring( // 4J - added limit to number of animals that can be bred if (level->canCreateMore(GetType(), Level::eSpawnType_Breed)) { std::shared_ptr offspring = - std::shared_ptr(new Ocelot(level)); + std::make_shared(level); if (isTame()) { offspring->setOwnerUUID(getOwnerUUID()); offspring->setTame(true); @@ -314,7 +314,7 @@ MobGroupData* Ocelot::finalizeMobSpawn( if (level->random->nextInt(7) == 0) { for (int kitten = 0; kitten < 2; kitten++) { std::shared_ptr ocelot = - std::shared_ptr(new Ocelot(level)); + std::make_shared(level); ocelot->moveTo(x, y, z, yRot, 0); ocelot->setAge(-20 * 60 * 20); level->addEntity(ocelot); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Pig.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Pig.cpp index d587da46b..a4c2949bc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Pig.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Pig.cpp @@ -141,7 +141,7 @@ void Pig::setSaddle(bool value) { void Pig::thunderHit(const LightningBolt* lightningBolt) { if (level->isClientSide) return; std::shared_ptr pz = - std::shared_ptr(new PigZombie(level)); + std::make_shared(level); pz->moveTo(x, y, z, yRot, xRot); level->addEntity(pz); remove(); @@ -160,7 +160,7 @@ std::shared_ptr Pig::getBreedOffspring( std::shared_ptr target) { // 4J - added limit to number of animals that can be bred if (level->canCreateMore(GetType(), Level::eSpawnType_Breed)) { - return std::shared_ptr(new Pig(level)); + return std::make_shared(level); } else { return nullptr; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Sheep.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Sheep.cpp index c611bbf8c..71d48ddea 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Sheep.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Sheep.cpp @@ -259,7 +259,7 @@ std::shared_ptr Sheep::getBreedOffspring( if (level->canCreateMore(GetType(), Level::eSpawnType_Breed)) { std::shared_ptr otherSheep = std::dynamic_pointer_cast(target); - std::shared_ptr sheep = std::shared_ptr(new Sheep(level)); + std::shared_ptr sheep = std::make_shared(level); int color = getOffspringColor( std::dynamic_pointer_cast(shared_from_this()), otherSheep); sheep->setColor(15 - color); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/SnowMan.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/SnowMan.cpp index f603a3e5a..776b7fe04 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/SnowMan.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/SnowMan.cpp @@ -96,8 +96,8 @@ void SnowMan::dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel) { void SnowMan::performRangedAttack(std::shared_ptr target, float power) { - std::shared_ptr snowball = std::shared_ptr(new Snowball( - level, std::dynamic_pointer_cast(shared_from_this()))); + std::shared_ptr snowball = std::make_shared( + level, std::dynamic_pointer_cast(shared_from_this())); double xd = target->x - x; double yd = (target->y + target->getHeadHeight() - 1.1f) - snowball->y; double zd = target->z - z; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Squid.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Squid.cpp index 9b867c247..6f6a9ea1e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Squid.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Squid.cpp @@ -63,8 +63,8 @@ bool Squid::makeStepSound() { return false; } void Squid::dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel) { int count = random->nextInt(3 + playerBonusLevel) + 1; for (int i = 0; i < count; i++) { - spawnAtLocation(std::shared_ptr(new ItemInstance( - Item::dye_powder, 1, DyePowderItem::BLACK)), + spawnAtLocation(std::make_shared( + Item::dye_powder, 1, DyePowderItem::BLACK), 0.0f); } } diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Wolf.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Wolf.cpp index f6250c33f..ff831ab94 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Wolf.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Wolf.cpp @@ -462,7 +462,7 @@ std::shared_ptr Wolf::getBreedOffspring( // 4J - added limit to wolves that can be bred if (level->canCreateMore(GetType(), Level::eSpawnType_Breed)) { std::shared_ptr pBabyWolf = - std::shared_ptr(new Wolf(level)); + std::make_shared(level); if (!getOwnerUUID().empty()) { // set the baby wolf to be tame, and assign the owner diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp index 305f164e2..e61922d34 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp @@ -104,31 +104,31 @@ EnderDragon::EnderDragon(Level* level) : Mob(level) { // 4J - split off from ctor so we can use shared_from_this() void EnderDragon::AddParts() { - head = std::shared_ptr(new MultiEntityMobPart( + head = std::make_shared( std::dynamic_pointer_cast(shared_from_this()), L"head", - 6, 6)); - neck = std::shared_ptr(new MultiEntityMobPart( + 6, 6); + neck = std::make_shared( std::dynamic_pointer_cast(shared_from_this()), L"neck", 6, - 6)); // 4J Added - body = std::shared_ptr(new MultiEntityMobPart( + 6); // 4J Added + body = std::make_shared( std::dynamic_pointer_cast(shared_from_this()), L"body", - 8, 8)); - tail1 = std::shared_ptr(new MultiEntityMobPart( + 8, 8); + tail1 = std::make_shared( std::dynamic_pointer_cast(shared_from_this()), L"tail", - 4, 4)); - tail2 = std::shared_ptr(new MultiEntityMobPart( + 4, 4); + tail2 = std::make_shared( std::dynamic_pointer_cast(shared_from_this()), L"tail", - 4, 4)); - tail3 = std::shared_ptr(new MultiEntityMobPart( + 4, 4); + tail3 = std::make_shared( std::dynamic_pointer_cast(shared_from_this()), L"tail", - 4, 4)); - wing1 = std::shared_ptr(new MultiEntityMobPart( + 4, 4); + wing1 = std::make_shared( std::dynamic_pointer_cast(shared_from_this()), L"wing", - 4, 4)); - wing2 = std::shared_ptr(new MultiEntityMobPart( + 4, 4); + wing2 = std::make_shared( std::dynamic_pointer_cast(shared_from_this()), L"wing", - 4, 4)); + 4, 4); subEntities.push_back(head); subEntities.push_back(neck); // 4J Added @@ -763,10 +763,10 @@ void EnderDragon::aiStep() { level->levelEvent(nullptr, LevelEvent::SOUND_GHAST_FIREBALL, (int)x, (int)y, (int)z, 0); std::shared_ptr ie = - std::shared_ptr(new DragonFireball( + std::make_shared( level, std::dynamic_pointer_cast(shared_from_this()), - xdd, ydd, zdd)); + xdd, ydd, zdd); ie->x = startingX; ie->y = startingY; ie->z = startingZ; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.cpp index 525780031..f26f2f506 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.cpp @@ -402,9 +402,9 @@ void WitherBoss::performRangedAttack(int head, double tx, double ty, double tz, double zd = tz - hz; std::shared_ptr ie = - std::shared_ptr(new WitherSkull( + std::make_shared( level, std::dynamic_pointer_cast(shared_from_this()), - xd, yd, zd)); + xd, yd, zd); if (dangerous) ie->setDangerous(true); ie->y = hy; ie->x = hx; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/FallingTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/item/FallingTile.cpp index a00f1cff2..e3feaa76f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/FallingTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/FallingTile.cpp @@ -150,10 +150,10 @@ void FallingTile::tick() { } else { if (dropItem && !cancelDrop) spawnAtLocation( - std::shared_ptr(new ItemInstance( + std::make_shared( tile, 1, Tile::tiles[tile]->getSpawnResourcesAuxValue( - data))), + data)), 0); } } @@ -162,9 +162,9 @@ void FallingTile::tick() { (time > 20 * 30)) { if (dropItem) spawnAtLocation( - std::shared_ptr(new ItemInstance( + std::make_shared( tile, 1, - Tile::tiles[tile]->getSpawnResourcesAuxValue(data))), + Tile::tiles[tile]->getSpawnResourcesAuxValue(data)), 0); remove(); } diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/ItemEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/item/ItemEntity.cpp index d1a9416bc..ba28ee81b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/ItemEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/ItemEntity.cpp @@ -280,7 +280,7 @@ std::shared_ptr ItemEntity::getItem() { // level.getLogger().severe("Item entity " + entityId + " has no // item?!"); } - return std::shared_ptr(new ItemInstance(Tile::stone)); + return std::make_shared(Tile::stone); } return result; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/Minecart.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/item/Minecart.cpp index 1ce133fd1..1c693a92e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/Minecart.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/Minecart.cpp @@ -194,7 +194,7 @@ bool Minecart::hurt(DamageSource* source, float hurtDamage) { void Minecart::destroy(DamageSource* source) { remove(); std::shared_ptr item = - std::shared_ptr(new ItemInstance(Item::minecart, 1)); + std::make_shared(Item::minecart, 1); if (!name.empty()) item->setHoverName(name); spawnAtLocation(item, 0); } diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartContainer.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartContainer.cpp index 68a1ec80b..ce2422b6c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartContainer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartContainer.cpp @@ -40,10 +40,10 @@ void MinecartContainer::destroy(DamageSource* source) { item->count -= count; std::shared_ptr itemEntity = - std::shared_ptr(new ItemEntity( + std::make_shared( level, x + xo, y + yo, z + zo, - std::shared_ptr(new ItemInstance( - item->id, count, item->getAuxValue())))); + std::make_shared( + item->id, count, item->getAuxValue())); float pow = 0.05f; itemEntity->xd = (float)random->nextGaussian() * pow; itemEntity->yd = (float)random->nextGaussian() * pow + 0.2f; @@ -136,10 +136,10 @@ void MinecartContainer::remove() { item->count -= count; std::shared_ptr itemEntity = - std::shared_ptr(new ItemEntity( + std::make_shared( level, x + xo, y + yo, z + zo, - std::shared_ptr(new ItemInstance( - item->id, count, item->getAuxValue())))); + std::make_shared( + item->id, count, item->getAuxValue())); if (item->hasTag()) { itemEntity->getItem()->setTag( diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartFurnace.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartFurnace.cpp index 749be119c..75c9b2b57 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartFurnace.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartFurnace.cpp @@ -67,7 +67,7 @@ void MinecartFurnace::destroy(DamageSource* source) { if (!source->isExplosion()) { spawnAtLocation( - std::shared_ptr(new ItemInstance(Tile::furnace, 1)), + std::make_shared(Tile::furnace, 1), 0); } } diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartTNT.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartTNT.cpp index fad0d9867..72199cb72 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartTNT.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartTNT.cpp @@ -58,7 +58,7 @@ void MinecartTNT::destroy(DamageSource* source) { if (!source->isExplosion()) { spawnAtLocation( - std::shared_ptr(new ItemInstance(Tile::tnt, 1)), 0); + std::make_shared(Tile::tnt, 1), 0); } if (source->isFire() || source->isExplosion() || speedSqr >= 0.01f) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Blaze.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Blaze.cpp index f691f9e59..294994947 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Blaze.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Blaze.cpp @@ -134,11 +134,11 @@ void Blaze::checkHurtTarget(std::shared_ptr target, float d) { // * 0.2f + 1.0f); for (int i = 0; i < 1; i++) { std::shared_ptr ie = - std::shared_ptr(new SmallFireball( + std::make_shared( level, std::dynamic_pointer_cast(shared_from_this()), xd + random->nextGaussian() * sqd, yd, - zd + random->nextGaussian() * sqd)); + zd + random->nextGaussian() * sqd); // Vec3 v = getViewVector(1); // ie.x = x + v.x * 1.5; ie->y = y + bbHeight / 2 + 0.5f; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Ghast.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Ghast.cpp index 51f99552f..1b234fc39 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Ghast.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Ghast.cpp @@ -147,10 +147,10 @@ void Ghast::serverAiStep() { level->levelEvent(nullptr, LevelEvent::SOUND_GHAST_FIREBALL, (int)x, (int)y, (int)z, 0); std::shared_ptr ie = - std::shared_ptr(new LargeFireball( + std::make_shared( level, std::dynamic_pointer_cast(shared_from_this()), xdd, - ydd, zdd)); + ydd, zdd); ie->explosionPower = explosionPower; double d = 4; Vec3 v = getViewVector(1); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.cpp index 6eb96b77d..b73433fe0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.cpp @@ -44,7 +44,7 @@ float LavaSlime::getBrightness(float a) { return 1.0f; } ePARTICLE_TYPE LavaSlime::getParticleName() { return eParticleType_flame; } std::shared_ptr LavaSlime::createChild() { - return std::shared_ptr(new LavaSlime(level)); + return std::make_shared(level); } int LavaSlime::getDeathLoot() { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Skeleton.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Skeleton.cpp index 5859d0ec8..79a92d715 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Skeleton.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Skeleton.cpp @@ -205,8 +205,8 @@ void Skeleton::dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel) { void Skeleton::dropRareDeathLoot(int rareLootLevel) { if (getSkeletonType() == TYPE_WITHER) { - spawnAtLocation(std::shared_ptr(new ItemInstance( - Item::skull_Id, 1, SkullTileEntity::TYPE_WITHER)), + spawnAtLocation(std::make_shared( + Item::skull_Id, 1, SkullTileEntity::TYPE_WITHER), 0); } } @@ -215,7 +215,7 @@ void Skeleton::populateDefaultEquipmentSlots() { Monster::populateDefaultEquipmentSlots(); setEquippedSlot(SLOT_WEAPON, - std::shared_ptr(new ItemInstance(Item::bow))); + std::make_shared(Item::bow)); } MobGroupData* Skeleton::finalizeMobSpawn( @@ -247,9 +247,9 @@ MobGroupData* Skeleton::finalizeMobSpawn( // Halloween! OooOOo! 25% of all skeletons/zombies can wear pumpkins // on their heads. setEquippedSlot(SLOT_HELM, - std::shared_ptr(new ItemInstance( + std::make_shared( random->nextFloat() < 0.1f ? Tile::litPumpkin - : Tile::pumpkin))); + : Tile::pumpkin)); dropChances[SLOT_HELM] = 0; } } @@ -271,9 +271,9 @@ void Skeleton::reassessWeaponGoal() { void Skeleton::performRangedAttack(std::shared_ptr target, float power) { - std::shared_ptr arrow = std::shared_ptr(new Arrow( + std::shared_ptr arrow = std::make_shared( level, std::dynamic_pointer_cast(shared_from_this()), - target, 1.60f, 14 - (level->difficulty * 4))); + target, 1.60f, 14 - (level->difficulty * 4)); int damageBonus = EnchantmentHelper::getEnchantmentLevel( Enchantment::arrowBonus->id, getCarriedItem()); int knockbackBonus = EnchantmentHelper::getEnchantmentLevel( diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.cpp index aec3de3f1..228403db2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.cpp @@ -159,7 +159,7 @@ void Slime::decreaseSquish() { targetSquish = targetSquish * 0.6f; } int Slime::getJumpDelay() { return random->nextInt(20) + 10; } std::shared_ptr Slime::createChild() { - return std::shared_ptr(new Slime(level)); + return std::make_shared(level); } void Slime::remove() { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Spider.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Spider.cpp index 6c471de49..74bcd66bb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Spider.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Spider.cpp @@ -160,7 +160,7 @@ MobGroupData* Spider::finalizeMobSpawn( #endif { std::shared_ptr skeleton = - std::shared_ptr(new Skeleton(level)); + std::make_shared(level); skeleton->moveTo(x, y, z, yRot, 0); skeleton->finalizeMobSpawn(nullptr); level->addEntity(skeleton); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Witch.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Witch.cpp index 42ac96aa8..822293f56 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Witch.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Witch.cpp @@ -212,9 +212,9 @@ void Witch::performRangedAttack(std::shared_ptr target, if (isUsingItem()) return; std::shared_ptr potion = - std::shared_ptr(new ThrownPotion( + std::make_shared( level, std::dynamic_pointer_cast(shared_from_this()), - PotionBrewing::POTION_ID_SPLASH_DAMAGE)); + PotionBrewing::POTION_ID_SPLASH_DAMAGE); potion->xRot -= -20; double xd = (target->x + target->xd) - x; double yd = (target->y + target->getHeadHeight() - 1.1f) - y; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Zombie.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Zombie.cpp index 80500540f..177089c34 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Zombie.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Zombie.cpp @@ -189,7 +189,7 @@ bool Zombie::hurt(DamageSource* source, float dmg) { int y = Mth::floor(this->y); int z = Mth::floor(this->z); std::shared_ptr reinforcement = - std::shared_ptr(new Zombie(level)); + std::make_shared(level); for (int i = 0; i < REINFORCEMENT_ATTEMPTS; i++) { int xt = x + random->nextInt(REINFORCEMENT_RANGE_MIN, @@ -335,7 +335,7 @@ void Zombie::killed(std::shared_ptr mob) { return; std::shared_ptr zombie = - std::shared_ptr(new Zombie(level)); + std::make_shared(level); zombie->copyPosition(mob); level->removeEntity(mob); zombie->finalizeMobSpawn(nullptr); @@ -384,9 +384,9 @@ MobGroupData* Zombie::finalizeMobSpawn( // Halloween! OooOOo! 25% of all skeletons/zombies can wear // pumpkins on their heads. setEquippedSlot(SLOT_HELM, - std::shared_ptr(new ItemInstance( + std::make_shared( random->nextFloat() < 0.1f ? Tile::litPumpkin - : Tile::pumpkin))); + : Tile::pumpkin)); dropChances[SLOT_HELM] = 0; } } @@ -474,7 +474,7 @@ bool Zombie::isConverting() { void Zombie::finishConversion() { std::shared_ptr villager = - std::shared_ptr(new Villager(level)); + std::make_shared(level); villager->copyPosition(shared_from_this()); villager->finalizeMobSpawn(nullptr); villager->setRewardPlayersInVillage(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.cpp index b37b5a084..4f7d1c14f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.cpp @@ -370,8 +370,8 @@ void Villager::addOffers(int addCount) { new ItemInstance(Tile::gravel, 10)), std::shared_ptr( new ItemInstance(Item::emerald)), - std::shared_ptr(new ItemInstance( - Item::flint_Id, 4 + random->nextInt(2), 0)))); + std::make_shared( + Item::flint_Id, 4 + random->nextInt(2), 0))); } break; case PROFESSION_BUTCHER: @@ -479,7 +479,7 @@ void Villager::addOffers(int addCount) { int cost = 2 + random->nextInt(5 + (level * 10)) + 3 * level; newOffers->push_back(new MerchantRecipe( - std::shared_ptr(new ItemInstance(Item::book)), + std::make_shared(Item::book), std::shared_ptr( new ItemInstance(Item::emerald, cost)), book)); @@ -506,8 +506,8 @@ void Villager::addOffers(int addCount) { newOffers->push_back(new MerchantRecipe( std::shared_ptr( new ItemInstance(id, 1, 0)), - std::shared_ptr(new ItemInstance( - Item::emerald, 2 + random->nextInt(3), 0)), + std::make_shared( + Item::emerald, 2 + random->nextInt(3), 0), EnchantmentHelper::enchantItem( random, std::shared_ptr( @@ -667,7 +667,7 @@ void Villager::addItemForPurchase(MerchantRecipeList* list, int itemId, rubyItem = std::shared_ptr( new ItemInstance(Item::emerald_Id, purchaseCost, 0)); resultItem = - std::shared_ptr(new ItemInstance(itemId, 1, 0)); + std::make_shared(itemId, 1, 0); } list->push_back(new MerchantRecipe(rubyItem, resultItem)); } @@ -728,7 +728,7 @@ std::shared_ptr Villager::getBreedOffspring( // 4J - added limit to villagers that can be bred if (level->canCreateMore(GetType(), Level::eSpawnType_Breed)) { std::shared_ptr villager = - std::shared_ptr(new Villager(level)); + std::make_shared(level); villager->finalizeMobSpawn(nullptr); return villager; } else { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Inventory.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/player/Inventory.cpp index 4ed9bd7cd..9408a8205 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Inventory.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/player/Inventory.cpp @@ -566,7 +566,7 @@ bool Inventory::isSame(std::shared_ptr a, std::shared_ptr Inventory::copy() { std::shared_ptr copy = - std::shared_ptr(new Inventory(nullptr)); + std::make_shared(nullptr); for (unsigned int i = 0; i < items.size(); i++) { copy->items[i] = items[i] != nullptr ? items[i]->copy() : nullptr; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.cpp index 9535c0fdf..51d706834 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.cpp @@ -92,7 +92,7 @@ void Player::_init() { registerAttributes(); setHealth(getMaxHealth()); - inventory = std::shared_ptr(new Inventory(this)); + inventory = std::make_shared(this); userType = 0; oBob = bob = 0.0f; @@ -932,7 +932,7 @@ void Player::die(DamageSource* source) { // 4J - TODO need to use a xuid if (app.isXuidNotch(m_xuid)) { - drop(std::shared_ptr(new ItemInstance(Item::apple, 1)), + drop(std::make_shared(Item::apple, 1), true); } if (!level->getGameRules()->getBoolean(GameRules::RULE_KEEPINVENTORY)) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.cpp index 50d8fc5f7..b8d03bb7d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.cpp @@ -409,9 +409,9 @@ int FishingHook::retrieve() { ie->Entity::zd = za * speed; level->addEntity(ie); owner->level->addEntity( - std::shared_ptr(new ExperienceOrb( + std::make_shared( owner->level, owner->x, owner->y + 0.5f, owner->z + 0.5f, - random->nextInt(6) + 1))); // 4J Stu brought forward from 1.4 + random->nextInt(6) + 1)); // 4J Stu brought forward from 1.4 dmg = 1; } if (inGround) dmg = 2; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEgg.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEgg.cpp index 86ef47e27..e2674b242 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEgg.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEgg.cpp @@ -44,7 +44,7 @@ void ThrownEgg::onHit(HitResult* res) { if (random->nextInt(32) == 0) count = 4; for (int i = 0; i < count; i++) { std::shared_ptr chicken = - std::shared_ptr(new Chicken(level)); + std::make_shared(level); chicken->setAge(-20 * 60 * 20); chicken->moveTo(x, y, z, yRot, 0); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownPotion.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownPotion.cpp index ad3517115..4fa35f922 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownPotion.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownPotion.cpp @@ -78,14 +78,14 @@ float ThrownPotion::getThrowUpAngleOffset() { return -20; } void ThrownPotion::setPotionValue(int potionValue) { if (potionItem == nullptr) potionItem = - std::shared_ptr(new ItemInstance(Item::potion, 1, 0)); + std::make_shared(Item::potion, 1, 0); potionItem->setAuxValue(potionValue); } int ThrownPotion::getPotionValue() { if (potionItem == nullptr) potionItem = - std::shared_ptr(new ItemInstance(Item::potion, 1, 0)); + std::make_shared(Item::potion, 1, 0); return potionItem->getAuxValue(); } diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/AnvilMenu.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/AnvilMenu.cpp index a3b6c48f6..e224b53b1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/AnvilMenu.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/AnvilMenu.cpp @@ -8,7 +8,7 @@ AnvilMenu::AnvilMenu(std::shared_ptr inventory, Level* level, int xt, int yt, int zt, std::shared_ptr player) { - resultSlots = std::shared_ptr(new ResultContainer()); + resultSlots = std::make_shared(); repairSlots = std::shared_ptr( new RepairContainer(this, IDS_REPAIR_AND_NAME, true, 2)); cost = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/CraftingMenu.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/CraftingMenu.cpp index 64af377d0..69e65c5b5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/CraftingMenu.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/CraftingMenu.cpp @@ -26,8 +26,8 @@ CraftingMenu::CraftingMenu(std::shared_ptr inventory, Level* level, int xt, int yt, int zt) : AbstractContainerMenu() { craftSlots = - std::shared_ptr(new CraftingContainer(this, 3, 3)); - resultSlots = std::shared_ptr(new ResultContainer()); + std::make_shared(this, 3, 3); + resultSlots = std::make_shared(); this->level = level; x = xt; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.cpp index 9c9bf2014..2e6503ca3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.cpp @@ -22,7 +22,7 @@ EnchantmentMenu::EnchantmentMenu(std::shared_ptr inventory, Level* level, int xt, int yt, int zt) { enchantSlots = - std::shared_ptr(new EnchantmentContainer(this)); + std::make_shared(this); for (int i = 0; i < 3; ++i) { costs[i] = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/FireworksMenu.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/FireworksMenu.cpp index 4d8654cef..690570233 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/FireworksMenu.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/FireworksMenu.cpp @@ -22,8 +22,8 @@ FireworksMenu::FireworksMenu(std::shared_ptr inventory, Level* level, m_canMakeFade = false; craftSlots = - std::shared_ptr(new CraftingContainer(this, 3, 3)); - resultSlots = std::shared_ptr(new ResultContainer()); + std::make_shared(this, 3, 3); + resultSlots = std::make_shared(); this->level = level; x = xt; diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/InventoryMenu.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/InventoryMenu.cpp index 853450d83..0af0fc48c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/InventoryMenu.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/InventoryMenu.cpp @@ -36,8 +36,8 @@ InventoryMenu::InventoryMenu(std::shared_ptr inventory, bool active, void InventoryMenu::_init(std::shared_ptr inventory, bool active) { craftSlots = - std::shared_ptr(new CraftingContainer(this, 2, 2)); - resultSlots = std::shared_ptr(new ResultContainer()); + std::make_shared(this, 2, 2); + resultSlots = std::make_shared(); this->active = active; addSlot( diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/ResultSlot.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/ResultSlot.cpp index f959129a1..58ceb426c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/ResultSlot.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/ResultSlot.cpp @@ -88,8 +88,8 @@ void ResultSlot::onTake(std::shared_ptr player, if (item->getItem()->hasCraftingRemainingItem()) { std::shared_ptr craftResult = - std::shared_ptr(new ItemInstance( - item->getItem()->getCraftingRemainingItem())); + std::make_shared( + item->getItem()->getCraftingRemainingItem()); /* * Try to place this in the player's inventory (See we.java for diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/BowItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/BowItem.cpp index a44b0eab0..73729e2ad 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/BowItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/BowItem.cpp @@ -41,7 +41,7 @@ void BowItem::releaseUsing(std::shared_ptr itemInstance, if (pow > 1) pow = 1; std::shared_ptr arrow = - std::shared_ptr(new Arrow(level, player, pow * 2.0f)); + std::make_shared(level, player, pow * 2.0f); if (pow == 1) arrow->setCritArrow(true); int damageBonus = EnchantmentHelper::getEnchantmentLevel( Enchantment::arrowBonus->id, itemInstance); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/BowlFoodItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/BowlFoodItem.cpp index 76cbe5fa0..16505ee15 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/BowlFoodItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/BowlFoodItem.cpp @@ -15,5 +15,5 @@ std::shared_ptr BowlFoodItem::useTimeDepleted( std::shared_ptr player) { FoodItem::useTimeDepleted(instance, level, player); - return std::shared_ptr(new ItemInstance(Item::bowl)); + return std::make_shared(Item::bowl); } \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/EggItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/EggItem.cpp index 696835f05..5f231d3f8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/EggItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/EggItem.cpp @@ -23,6 +23,6 @@ std::shared_ptr EggItem::use( 0.4f / (random->nextFloat() * 0.4f + 0.8f)); if (!level->isClientSide) level->addEntity( - std::shared_ptr(new ThrownEgg(level, player))); + std::make_shared(level, player)); return instance; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/EmptyMapItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/EmptyMapItem.cpp index 06729ea54..8a7c2dcac 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/EmptyMapItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/EmptyMapItem.cpp @@ -29,7 +29,7 @@ std::shared_ptr EmptyMapItem::use( // data.setDirty(); std::shared_ptr map = - std::shared_ptr(new ItemInstance(Item::map, 1, -1)); + std::make_shared(Item::map, 1, -1); Item::map->onCraftedBy(map, level, player); itemInstance->count--; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/EnchantedBookItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/EnchantedBookItem.cpp index e95359658..3a16f9fee 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/EnchantedBookItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/EnchantedBookItem.cpp @@ -109,7 +109,7 @@ void EnchantedBookItem::addEnchantment(std::shared_ptr item, std::shared_ptr EnchantedBookItem::createForEnchantment( EnchantmentInstance* enchant) { std::shared_ptr item = - std::shared_ptr(new ItemInstance(this)); + std::make_shared(this); addEnchantment(item, enchant); return item; } @@ -127,7 +127,7 @@ std::shared_ptr EnchantedBookItem::createForRandomLoot( Enchantment* enchantment = Enchantment::validEnchantments[random->nextInt( Enchantment::validEnchantments.size())]; std::shared_ptr book = - std::shared_ptr(new ItemInstance(id, 1, 0)); + std::make_shared(id, 1, 0); int level = random->nextInt(enchantment->getMinLevel(), enchantment->getMaxLevel()); @@ -147,7 +147,7 @@ WeighedTreasure* EnchantedBookItem::createForRandomTreasure(Random* random, Enchantment* enchantment = Enchantment::validEnchantments[random->nextInt( Enchantment::validEnchantments.size())]; std::shared_ptr book = - std::shared_ptr(new ItemInstance(id, 1, 0)); + std::make_shared(id, 1, 0); int level = random->nextInt(enchantment->getMinLevel(), enchantment->getMaxLevel()); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/EnderEyeItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/EnderEyeItem.cpp index 8e90dd178..251ed8855 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/EnderEyeItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/EnderEyeItem.cpp @@ -208,9 +208,9 @@ std::shared_ptr EnderEyeItem::use( if ((level->dimension->id == LevelData::DIMENSION_OVERWORLD) && level->getLevelData()->getHasStronghold()) { std::shared_ptr eyeOfEnderSignal = - std::shared_ptr(new EyeOfEnderSignal( + std::make_shared( level, player->x, player->y + 1.62 - player->heightOffset, - player->z)); + player->z); eyeOfEnderSignal->signalTo( level->getLevelData()->getXStronghold() << 4, player->y + 1.62 - player->heightOffset, diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FireworksItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/FireworksItem.cpp index 2a5315de6..3ead6fae3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/FireworksItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/FireworksItem.cpp @@ -27,8 +27,8 @@ bool FireworksItem::useOn(std::shared_ptr instance, if (!level->isClientSide) { std::shared_ptr f = - std::shared_ptr(new FireworksRocketEntity( - level, x + clickX, y + clickY, z + clickZ, instance)); + std::make_shared( + level, x + clickX, y + clickY, z + clickZ, instance); level->addEntity(f); if (!player->abilities.instabuild) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FishingRodItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/FishingRodItem.cpp index 6ed9fa6ed..5c1bcc0f2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/FishingRodItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/FishingRodItem.cpp @@ -37,7 +37,7 @@ std::shared_ptr FishingRodItem::use( // 4J Stu - Move the player->fishing out of the ctor as we cannot // reference 'this' std::shared_ptr hook = - std::shared_ptr(new FishingHook(level, player)); + std::make_shared(level, player); player->fishing = hook; level->addEntity(std::shared_ptr(hook)); } diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/HangingEntityItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/HangingEntityItem.cpp index 6fe98c22c..e1e58fde2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/HangingEntityItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/HangingEntityItem.cpp @@ -69,7 +69,7 @@ std::shared_ptr HangingEntityItem::createEntity( { if (eType == eTYPE_PAINTING) { std::shared_ptr painting = - std::shared_ptr(new Painting(level, x, y, z, dir)); + std::make_shared(level, x, y, z, dir); #ifndef _CONTENT_PACKAGE if (app.DebugArtToolsOn() && auxValue > 0) { @@ -83,7 +83,7 @@ std::shared_ptr HangingEntityItem::createEntity( return std::dynamic_pointer_cast(painting); } else if (eType == eTYPE_ITEM_FRAME) { std::shared_ptr itemFrame = - std::shared_ptr(new ItemFrame(level, x, y, z, dir)); + std::make_shared(level, x, y, z, dir); return std::dynamic_pointer_cast(itemFrame); } else { diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ItemInstance.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/ItemInstance.cpp index 2b144df74..ea8f8e241 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/ItemInstance.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/ItemInstance.cpp @@ -90,7 +90,7 @@ ItemInstance::~ItemInstance() { std::shared_ptr ItemInstance::remove(int count) { std::shared_ptr ii = - std::shared_ptr(new ItemInstance(id, count, auxValue)); + std::make_shared(id, count, auxValue); if (tag != nullptr) ii->tag = (CompoundTag*)tag->copy(); this->count -= count; @@ -260,7 +260,7 @@ bool ItemInstance::interactEnemy(std::shared_ptr player, std::shared_ptr ItemInstance::copy() const { std::shared_ptr copy = - std::shared_ptr(new ItemInstance(id, count, auxValue)); + std::make_shared(id, count, auxValue); if (tag != nullptr) { copy->tag = (CompoundTag*)tag->copy(); } diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/MapItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/MapItem.cpp index 07f528092..b74ee56e9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/MapItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/MapItem.cpp @@ -45,7 +45,7 @@ std::shared_ptr MapItem::getSavedData(short idNum, id = std::wstring(L"map_") + _toString(aux); mapItemSavedData = - std::shared_ptr(new MapItemSavedData(id)); + std::make_shared(id); level->setSavedData(id, (std::shared_ptr)mapItemSavedData); } @@ -70,7 +70,7 @@ std::shared_ptr MapItem::getSavedData( id = std::wstring(L"map_") + _toString(itemInstance->getAuxValue()); mapItemSavedData = - std::shared_ptr(new MapItemSavedData(id)); + std::make_shared(id); newData = true; } @@ -309,8 +309,8 @@ std::shared_ptr MapItem::getUpdatePacket( if (data.empty()) return nullptr; std::shared_ptr retval = - std::shared_ptr(new ComplexItemDataPacket( - (short)Item::map->id, (short)itemInstance->getAuxValue(), data)); + std::make_shared( + (short)Item::map->id, (short)itemInstance->getAuxValue(), data); return retval; } @@ -341,7 +341,7 @@ void MapItem::onCraftedBy(std::shared_ptr itemInstance, // 4J Stu - We only have one map per player per dimension, so don't reset // the one that they have when a new one is created if (data == nullptr) { - data = std::shared_ptr(new MapItemSavedData(id)); + data = std::make_shared(id); } level->setSavedData(id, (std::shared_ptr)data); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SnowballItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/SnowballItem.cpp index e2e599fc5..a43441651 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/SnowballItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/SnowballItem.cpp @@ -25,6 +25,6 @@ std::shared_ptr SnowballItem::use( 0.4f / (random->nextFloat() * 0.4f + 0.8f)); if (!level->isClientSide) level->addEntity( - std::shared_ptr(new Snowball(level, player))); + std::make_shared(level, player)); return instance; } \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FireworksRecipe.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FireworksRecipe.cpp index 04189fc1e..8b2f8fe5f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FireworksRecipe.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/crafting/FireworksRecipe.cpp @@ -101,7 +101,7 @@ bool FireworksRecipe::matches(std::shared_ptr craftSlots, // create fireworks if (sulphurCount >= 1 && paperCount == 1 && chargeComponents == 0) { resultItem = - std::shared_ptr(new ItemInstance(Item::fireworks)); + std::make_shared(Item::fireworks); if (chargeCount > 0) { CompoundTag* itemTag = new CompoundTag(); CompoundTag* fireTag = diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/trading/MerchantRecipe.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/trading/MerchantRecipe.cpp index 8ff52891b..9169ae7bb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/trading/MerchantRecipe.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/trading/MerchantRecipe.cpp @@ -39,11 +39,11 @@ MerchantRecipe::MerchantRecipe(std::shared_ptr buy, } MerchantRecipe::MerchantRecipe(std::shared_ptr buy, Item* sell) { - _init(buy, nullptr, std::shared_ptr(new ItemInstance(sell))); + _init(buy, nullptr, std::make_shared(sell)); } MerchantRecipe::MerchantRecipe(std::shared_ptr buy, Tile* sell) { - _init(buy, nullptr, std::shared_ptr(new ItemInstance(sell))); + _init(buy, nullptr, std::make_shared(sell)); } std::shared_ptr MerchantRecipe::getBuyAItem() { return buyA; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/Level.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/Level.cpp index 855d68b3b..3c4c75c64 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/Level.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/Level.cpp @@ -579,7 +579,7 @@ Level::Level(std::shared_ptr levelStorage, std::dynamic_pointer_cast( savedDataStorage->get(typeid(Villages), Villages::VILLAGE_FILE_ID)); if (savedVillages == nullptr) { - villages = std::shared_ptr(new Villages(this)); + villages = std::make_shared(this); savedDataStorage->set(Villages::VILLAGE_FILE_ID, villages); } else { villages = savedVillages; @@ -620,7 +620,7 @@ void Level::_init(std::shared_ptr levelStorage, std::dynamic_pointer_cast( savedDataStorage->get(typeid(Villages), Villages::VILLAGE_FILE_ID)); if (savedVillages == nullptr) { - villages = std::shared_ptr(new Villages(this)); + villages = std::make_shared(this); savedDataStorage->set(Villages::VILLAGE_FILE_ID, villages); } else { villages = savedVillages; @@ -2519,7 +2519,7 @@ std::shared_ptr Level::explode(std::shared_ptr source, double x, double y, double z, float r, bool fire, bool destroyBlocks) { std::shared_ptr explosion = - std::shared_ptr(new Explosion(this, source, x, y, z, r)); + std::make_shared(this, source, x, y, z, r); explosion->fire = fire; explosion->destroyBlocks = destroyBlocks; explosion->explode(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/TheEndBiomeDecorator.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/biome/TheEndBiomeDecorator.cpp index 1e7e9f1fc..62777c256 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/TheEndBiomeDecorator.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/TheEndBiomeDecorator.cpp @@ -55,7 +55,7 @@ void TheEndBiomeDecorator::decorate() { } if (xo == 0 && zo == 0) { std::shared_ptr enderDragon = - std::shared_ptr(new EnderDragon(level)); + std::make_shared(level); enderDragon->AddParts(); // 4J added enderDragon->moveTo(0, 128, 0, random->nextFloat() * 360, 0); level->addEntity(enderDragon); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HouseFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HouseFeature.cpp index b7b17e6d1..1b6c41837 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HouseFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/HouseFeature.cpp @@ -169,7 +169,7 @@ bool HouseFeature::place(Level* level, Random* random, int x, int y, int z) { } std::shared_ptr(pz) = - std::shared_ptr(new PigZombie(level)); + std::make_shared(level); pz->moveTo(x0 + w / 2.0 + 0.5, y0 + 0.5, z0 + d / 2.0 + 0.5, 0, 0); level->addEntity(pz); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpikeFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpikeFeature.cpp index a7cd66906..5e7126458 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpikeFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpikeFeature.cpp @@ -43,7 +43,7 @@ bool SpikeFeature::place(Level* level, Random* random, int x, int y, int z) { } std::shared_ptr enderCrystal = - std::shared_ptr(new EnderCrystal(level)); + std::make_shared(level); enderCrystal->moveTo(x + 0.5f, y + hh, z + 0.5f, random->nextFloat() * 360, 0); level->addEntity(enderCrystal); @@ -146,7 +146,7 @@ bool SpikeFeature::placeWithIndex(Level* level, Random* random, int x, int y, } std::shared_ptr enderCrystal = - std::shared_ptr(new EnderCrystal(level)); + std::make_shared(level); enderCrystal->moveTo(x + 0.5f, y + hh, z + 0.5f, random->nextFloat() * 360, 0); level->addEntity(enderCrystal); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp index 6ffa44945..69351e0fc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp @@ -490,8 +490,8 @@ bool MineShaftPieces::MineShaftCorridor::createChest( : RailTile::DIR_FLAT_Z), Tile::UPDATE_CLIENTS); std::shared_ptr chest = - std::shared_ptr(new MinecartChest( - level, worldX + 0.5f, worldY + 0.5f, worldZ + 0.5f)); + std::make_shared( + level, worldX + 0.5f, worldY + 0.5f, worldZ + 0.5f); WeighedTreasure::addChestItems(random, treasure, chest, numRolls); level->addEntity(chest); return true; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp index 93ef38a83..0fcca8220 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp @@ -945,7 +945,7 @@ bool ScatteredFeaturePieces::SwamplandHut::postProcess(Level* level, spawnedWitch = true; std::shared_ptr witch = - std::shared_ptr(new Witch(level)); + std::make_shared(level); witch->moveTo(wx + .5, wy, wz + .5, 0, 0); witch->finalizeMobSpawn(nullptr); level->addEntity(witch); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.cpp index 40b1ba46c..f81a29123 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.cpp @@ -67,7 +67,7 @@ std::shared_ptr FuzzyZoomLayer::zoom(int64_t seed, int count) { std::shared_ptr result = sup; for (int i = 0; i < count; i++) { - result = std::shared_ptr(new FuzzyZoomLayer(seed + i, result)); + result = std::make_shared(seed + i, result); } return result; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.cpp index 68e4b9de8..b1e82b6c9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.cpp @@ -31,18 +31,18 @@ std::vector> Layer::getDefaultLayers(int64_t seed, LevelT // the 1.2.3 version are new layer types that we don't have yet (shores, // swamprivers, region hills etc.) std::shared_ptr islandLayer = - std::shared_ptr(new IslandLayer(1)); - islandLayer = std::shared_ptr(new FuzzyZoomLayer(2000, islandLayer)); - islandLayer = std::shared_ptr(new AddIslandLayer(1, islandLayer)); - islandLayer = std::shared_ptr(new ZoomLayer(2001, islandLayer)); - islandLayer = std::shared_ptr(new AddIslandLayer(2, islandLayer)); - islandLayer = std::shared_ptr(new AddSnowLayer(2, islandLayer)); - islandLayer = std::shared_ptr(new ZoomLayer(2002, islandLayer)); - islandLayer = std::shared_ptr(new AddIslandLayer(3, islandLayer)); - islandLayer = std::shared_ptr(new ZoomLayer(2003, islandLayer)); - islandLayer = std::shared_ptr(new AddIslandLayer(4, islandLayer)); - // islandLayer = std::shared_ptr(new AddMushroomIslandLayer(5, - // islandLayer)); // 4J - old position of mushroom island layer + std::make_shared(1); + islandLayer = std::make_shared(2000, islandLayer); + islandLayer = std::make_shared(1, islandLayer); + islandLayer = std::make_shared(2001, islandLayer); + islandLayer = std::make_shared(2, islandLayer); + islandLayer = std::make_shared(2, islandLayer); + islandLayer = std::make_shared(2002, islandLayer); + islandLayer = std::make_shared(3, islandLayer); + islandLayer = std::make_shared(2003, islandLayer); + islandLayer = std::make_shared(4, islandLayer); + // islandLayer = std::make_shared(5, + // islandLayer); // 4J - old position of mushroom island layer int zoomLevel = 4; if (levelType == LevelType::lvl_largeBiomes) { @@ -51,26 +51,26 @@ std::vector> Layer::getDefaultLayers(int64_t seed, LevelT std::shared_ptr riverLayer = islandLayer; riverLayer = ZoomLayer::zoom(1000, riverLayer, 0); - riverLayer = std::shared_ptr(new RiverInitLayer(100, riverLayer)); + riverLayer = std::make_shared(100, riverLayer); riverLayer = ZoomLayer::zoom(1000, riverLayer, zoomLevel + 2); - riverLayer = std::shared_ptr(new RiverLayer(1, riverLayer)); - riverLayer = std::shared_ptr(new SmoothLayer(1000, riverLayer)); + riverLayer = std::make_shared(1, riverLayer); + riverLayer = std::make_shared(1000, riverLayer); std::shared_ptr biomeLayer = islandLayer; biomeLayer = ZoomLayer::zoom(1000, biomeLayer, 0); biomeLayer = - std::shared_ptr(new BiomeInitLayer(200, biomeLayer, levelType)); + std::make_shared(200, biomeLayer, levelType); biomeLayer = ZoomLayer::zoom(1000, biomeLayer, 2); - biomeLayer = std::shared_ptr(new RegionHillsLayer(1000, biomeLayer)); + biomeLayer = std::make_shared(1000, biomeLayer); for (int i = 0; i < zoomLevel; i++) { biomeLayer = - std::shared_ptr(new ZoomLayer(1000 + i, biomeLayer)); + std::make_shared(1000 + i, biomeLayer); if (i == 0) biomeLayer = - std::shared_ptr(new AddIslandLayer(3, biomeLayer)); + std::make_shared(3, biomeLayer); if (i == 0) { // 4J - moved mushroom islands to here. This skips 3 zooms that the @@ -97,14 +97,14 @@ std::vector> Layer::getDefaultLayers(int64_t seed, LevelT // edges into shores. We are doing this at i == 1 rather than i == 0 // as the original does biomeLayer = - std::shared_ptr(new ShoreLayer(1000, biomeLayer)); + std::make_shared(1000, biomeLayer); biomeLayer = - std::shared_ptr(new SwampRiversLayer(1000, biomeLayer)); + std::make_shared(1000, biomeLayer); } } - biomeLayer = std::shared_ptr(new SmoothLayer(1000, biomeLayer)); + biomeLayer = std::make_shared(1000, biomeLayer); biomeLayer = std::shared_ptr( new RiverMixerLayer(100, biomeLayer, riverLayer)); @@ -115,7 +115,7 @@ std::vector> Layer::getDefaultLayers(int64_t seed, LevelT app.GetGameSettingsDebugMask(PlatformInput.GetPrimaryPad()) & (1L << eDebugSetting_EnableBiomeOverride)) { biomeLayer = - std::shared_ptr(new BiomeOverrideLayer(1)); + std::make_shared(1); } #endif #endif @@ -123,7 +123,7 @@ std::vector> Layer::getDefaultLayers(int64_t seed, LevelT std::shared_ptr debugLayer = biomeLayer; std::shared_ptr zoomedLayer = - std::shared_ptr(new VoronoiZoom(10, biomeLayer)); + std::make_shared(10, biomeLayer); biomeLayer->init(seed); zoomedLayer->init(seed); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothZoomLayer.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothZoomLayer.cpp index 50c220988..58c1e9058 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothZoomLayer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/SmoothZoomLayer.cpp @@ -59,7 +59,7 @@ std::shared_ptr SmoothZoomLayer::zoom(int64_t seed, int count) { std::shared_ptr result = sup; for (int i = 0; i < count; i++) { - result = std::shared_ptr(new SmoothZoomLayer(seed + i, result)); + result = std::make_shared(seed + i, result); } return result; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/ZoomLayer.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/ZoomLayer.cpp index 1930e6cee..2ecf6da44 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/ZoomLayer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/ZoomLayer.cpp @@ -86,7 +86,7 @@ std::shared_ptr ZoomLayer::zoom(int64_t seed, std::shared_ptr sup, int count) { std::shared_ptr result = sup; for (int i = 0; i < count; i++) { - result = std::shared_ptr(new ZoomLayer(seed + i, result)); + result = std::make_shared(seed + i, result); } return result; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.cpp index 029b24b83..3b2d13c18 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.cpp @@ -217,7 +217,7 @@ void MapItemSavedData::tickCarriedBy(std::shared_ptr player, std::shared_ptr item) { if (carriedByPlayers.find(player) == carriedByPlayers.end()) { std::shared_ptr hp = - std::shared_ptr(new HoldingPlayer(player, this)); + std::make_shared(player, this); carriedByPlayers.insert( playerHoldingPlayerMapType::value_type(player, hp)); carriedBy.push_back(hp); @@ -523,7 +523,7 @@ MapItemSavedData::getHoldingPlayer(std::shared_ptr player) { auto it = carriedByPlayers.find(player); if (it == carriedByPlayers.end()) { - hp = std::shared_ptr(new HoldingPlayer(player, this)); + hp = std::make_shared(player, this); carriedByPlayers[player] = hp; carriedBy.push_back(hp); } else { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/SavedDataStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/storage/SavedDataStorage.cpp index 9e3096669..4ca206b27 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/SavedDataStorage.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/SavedDataStorage.cpp @@ -53,7 +53,7 @@ std::shared_ptr SavedDataStorage::get(const std::type_info& clazz, new MapItemSavedData(id))); } else if (clazz == typeid(Villages)) { data = std::dynamic_pointer_cast( - std::shared_ptr(new Villages(id))); + std::make_shared(id)); } else if (clazz == typeid(StructureFeatureSavedData)) { data = std::dynamic_pointer_cast( std::shared_ptr( diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BeaconTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BeaconTile.cpp index d7c22f051..8158a294c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BeaconTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BeaconTile.cpp @@ -14,7 +14,7 @@ BeaconTile::BeaconTile(int id) : BaseEntityTile(id, Material::glass, false) { } std::shared_ptr BeaconTile::newTileEntity(Level* level) { - return std::shared_ptr(new BeaconTileEntity()); + return std::make_shared(); } bool BeaconTile::use(Level* level, int x, int y, int z, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BrewingStandTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BrewingStandTile.cpp index 87a0050f0..3ba8096c5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BrewingStandTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BrewingStandTile.cpp @@ -33,7 +33,7 @@ bool BrewingStandTile::isSolidRender(bool isServerLevel) { return false; } int BrewingStandTile::getRenderShape() { return SHAPE_BREWING_STAND; } std::shared_ptr BrewingStandTile::newTileEntity(Level* level) { - return std::shared_ptr(new BrewingStandTileEntity()); + return std::make_shared(); } bool BrewingStandTile::isCubeShaped() { return false; } @@ -110,10 +110,10 @@ void BrewingStandTile::onRemove(Level* level, int x, int y, int z, int id, item->count -= count; std::shared_ptr itemEntity = - std::shared_ptr(new ItemEntity( + std::make_shared( level, x + xo, y + yo, z + zo, - std::shared_ptr(new ItemInstance( - item->id, count, item->getAuxValue())))); + std::make_shared( + item->id, count, item->getAuxValue())); float pow = 0.05f; itemEntity->xd = (float)random->nextGaussian() * pow; itemEntity->yd = (float)random->nextGaussian() * pow + 0.2f; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ChestTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ChestTile.cpp index a6dbd9393..88705fe4e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ChestTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ChestTile.cpp @@ -213,12 +213,12 @@ void ChestTile::onRemove(Level* level, int x, int y, int z, int id, int data) { item->count -= count; std::shared_ptr newItem = - std::shared_ptr(new ItemInstance( - item->id, count, item->getAuxValue())); + std::make_shared( + item->id, count, item->getAuxValue()); newItem->set4JData(item->get4JData()); std::shared_ptr itemEntity = - std::shared_ptr(new ItemEntity( - level, x + xo, y + yo, z + zo, newItem)); + std::make_shared( + level, x + xo, y + yo, z + zo, newItem); float pow = 0.05f; itemEntity->xd = (float)random->nextGaussian() * pow; itemEntity->yd = (float)random->nextGaussian() * pow + 0.2f; @@ -318,7 +318,7 @@ std::shared_ptr ChestTile::getContainer(Level* level, int x, int y, std::shared_ptr ChestTile::newTileEntity(Level* level) { std::shared_ptr retval = - std::shared_ptr(new ChestTileEntity()); + std::make_shared(); return retval; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CocoaTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CocoaTile.cpp index dcd8ea980..148fcc3b3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CocoaTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CocoaTile.cpp @@ -150,8 +150,8 @@ void CocoaTile::spawnResources(Level* level, int x, int y, int z, int data, } for (int i = 0; i < count; i++) { popResource(level, x, y, z, - std::shared_ptr(new ItemInstance( - Item::dye_powder, 1, DyePowderItem::BROWN))); + std::make_shared( + Item::dye_powder, 1, DyePowderItem::BROWN)); } } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CommandBlock.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CommandBlock.cpp index 762d7747c..4e63107ac 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CommandBlock.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CommandBlock.cpp @@ -16,7 +16,7 @@ CommandBlock::CommandBlock(int id) : BaseEntityTile(id, Material::metal, false) {} std::shared_ptr CommandBlock::newTileEntity(Level* level) { - return std::shared_ptr(new CommandBlockEntity()); + return std::make_shared(); } void CommandBlock::neighborChanged(Level* level, int x, int y, int z, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ComparatorTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ComparatorTile.cpp index b5b3524ed..cae878f86 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ComparatorTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ComparatorTile.cpp @@ -218,7 +218,7 @@ bool ComparatorTile::triggerEvent(Level* level, int x, int y, int z, int b0, } std::shared_ptr ComparatorTile::newTileEntity(Level* level) { - return std::shared_ptr(new ComparatorTileEntity()); + return std::make_shared(); } bool ComparatorTile::TestUse() { return true; } \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DispenserTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DispenserTile.cpp index dc1a9cf49..1a40aa527 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DispenserTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DispenserTile.cpp @@ -163,7 +163,7 @@ void DispenserTile::tick(Level* level, int x, int y, int z, Random* random) { } std::shared_ptr DispenserTile::newTileEntity(Level* level) { - return std::shared_ptr(new DispenserTileEntity()); + return std::make_shared(); } void DispenserTile::setPlacedBy(Level* level, int x, int y, int z, @@ -199,12 +199,12 @@ void DispenserTile::onRemove(Level* level, int x, int y, int z, int id, item->count -= count; std::shared_ptr newItem = - std::shared_ptr(new ItemInstance( - item->id, count, item->getAuxValue())); + std::make_shared( + item->id, count, item->getAuxValue()); newItem->set4JData(item->get4JData()); std::shared_ptr itemEntity = - std::shared_ptr(new ItemEntity( - level, x + xo, y + yo, z + zo, newItem)); + std::make_shared( + level, x + xo, y + yo, z + zo, newItem); float pow = 0.05f; itemEntity->xd = (float)random->nextGaussian() * pow; itemEntity->yd = (float)random->nextGaussian() * pow + 0.2f; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DropperTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DropperTile.cpp index c882f60c7..24a665171 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DropperTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DropperTile.cpp @@ -36,7 +36,7 @@ DispenseItemBehavior* DropperTile::getDispenseMethod( } std::shared_ptr DropperTile::newTileEntity(Level* level) { - return std::shared_ptr(new DropperTileEntity()); + return std::make_shared(); } void DropperTile::dispenseFrom(Level* level, int x, int y, int z) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnchantmentTableTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnchantmentTableTile.cpp index fe1fca4f2..44a11ff86 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnchantmentTableTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnchantmentTableTile.cpp @@ -69,7 +69,7 @@ Icon* EnchantmentTableTile::getTexture(int face, int data) { } std::shared_ptr EnchantmentTableTile::newTileEntity(Level* level) { - return std::shared_ptr(new EnchantmentTableEntity()); + return std::make_shared(); } bool EnchantmentTableTile::use( diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnderChestTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnderChestTile.cpp index 20974b0db..f7cc64091 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnderChestTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnderChestTile.cpp @@ -79,7 +79,7 @@ bool EnderChestTile::use(Level* level, int x, int y, int z, } std::shared_ptr EnderChestTile::newTileEntity(Level* level) { - return std::shared_ptr(new EnderChestTileEntity()); + return std::make_shared(); } void EnderChestTile::animateTick(Level* level, int xt, int yt, int zt, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FlowerPotTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FlowerPotTile.cpp index 1d13f38ff..49afec40b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FlowerPotTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FlowerPotTile.cpp @@ -108,7 +108,7 @@ int FlowerPotTile::getResource(int data, Random* random, int playerBonusLevel) { std::shared_ptr FlowerPotTile::getItemFromType(int type) { switch (type) { case TYPE_FLOWER_RED: - return std::shared_ptr(new ItemInstance(Tile::rose)); + return std::make_shared(Tile::rose); case TYPE_FLOWER_YELLOW: return std::shared_ptr( new ItemInstance(Tile::flower)); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FurnaceTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FurnaceTile.cpp index 72fc2309e..44918fafc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FurnaceTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FurnaceTile.cpp @@ -142,7 +142,7 @@ void FurnaceTile::setLit(bool lit, Level* level, int x, int y, int z) { } std::shared_ptr FurnaceTile::newTileEntity(Level* level) { - return std::shared_ptr(new FurnaceTileEntity()); + return std::make_shared(); } void FurnaceTile::setPlacedBy(Level* level, int x, int y, int z, @@ -192,12 +192,12 @@ void FurnaceTile::onRemove(Level* level, int x, int y, int z, int id, #endif std::shared_ptr newItem = - std::shared_ptr(new ItemInstance( - item->id, count, item->getAuxValue())); + std::make_shared( + item->id, count, item->getAuxValue()); newItem->set4JData(item->get4JData()); std::shared_ptr itemEntity = - std::shared_ptr(new ItemEntity( - level, x + xo, y + yo, z + zo, newItem)); + std::make_shared( + level, x + xo, y + yo, z + zo, newItem); float pow = 0.05f; itemEntity->xd = (float)random->nextGaussian() * pow; itemEntity->yd = diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HopperTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/HopperTile.cpp index 678f45942..d35bbaa7a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/HopperTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/HopperTile.cpp @@ -55,7 +55,7 @@ int HopperTile::getPlacedOnFaceDataValue(Level* level, int x, int y, int z, } std::shared_ptr HopperTile::newTileEntity(Level* level) { - return std::shared_ptr(new HopperTileEntity()); + return std::make_shared(); } void HopperTile::setPlacedBy(Level* level, int x, int y, int z, @@ -119,10 +119,10 @@ void HopperTile::onRemove(Level* level, int x, int y, int z, int id, int data) { item->count -= count; std::shared_ptr itemEntity = - std::shared_ptr(new ItemEntity( + std::make_shared( level, x + xo, y + yo, z + zo, - std::shared_ptr(new ItemInstance( - item->id, count, item->getAuxValue())))); + std::make_shared( + item->id, count, item->getAuxValue())); if (item->hasTag()) { itemEntity->getItem()->setTag( diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/JukeboxTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/JukeboxTile.cpp index d8b0c98f2..9b5a8b2a3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/JukeboxTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/JukeboxTile.cpp @@ -41,7 +41,7 @@ void JukeboxTile::Entity::save(CompoundTag* tag) { // 4J Added std::shared_ptr JukeboxTile::Entity::clone() { std::shared_ptr result = - std::shared_ptr(new JukeboxTile::Entity()); + std::make_shared(); TileEntity::clone(result); result->record = record; @@ -145,7 +145,7 @@ void JukeboxTile::spawnResources(Level* level, int x, int y, int z, int data, } std::shared_ptr JukeboxTile::newTileEntity(Level* level) { - return std::shared_ptr(new JukeboxTile::Entity()); + return std::make_shared(); } void JukeboxTile::registerIcons(IconRegister* iconRegister) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeafTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeafTile.cpp index 5f158e107..f4749be63 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeafTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeafTile.cpp @@ -242,8 +242,8 @@ void LeafTile::spawnResources(Level* level, int x, int y, int z, int data, if (level->random->nextInt(chance) == 0) { int type = getResource(data, level->random, playerBonusLevel); popResource(level, x, y, z, - std::shared_ptr(new ItemInstance( - type, 1, getSpawnResourcesAuxValue(data)))); + std::make_shared( + type, 1, getSpawnResourcesAuxValue(data))); } chance = 200; @@ -271,8 +271,8 @@ void LeafTile::playerDestroy(Level* level, std::shared_ptr player, // drop leaf block instead of sapling popResource(level, x, y, z, - std::shared_ptr(new ItemInstance( - Tile::leaves_Id, 1, data & LEAF_TYPE_MASK))); + std::make_shared( + Tile::leaves_Id, 1, data & LEAF_TYPE_MASK)); } else { TransparentTile::playerDestroy(level, player, x, y, z, data); } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MobSpawnerTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/MobSpawnerTile.cpp index c99a19670..613449309 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MobSpawnerTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/MobSpawnerTile.cpp @@ -12,7 +12,7 @@ MobSpawnerTile::MobSpawnerTile(int id) : BaseEntityTile(id, Material::stone, false) {} std::shared_ptr MobSpawnerTile::newTileEntity(Level* level) { - return std::shared_ptr(new MobSpawnerTileEntity()); + return std::make_shared(); } int MobSpawnerTile::getResource(int data, Random* random, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NoteBlockTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/NoteBlockTile.cpp index ae7406be5..980ee4805 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NoteBlockTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/NoteBlockTile.cpp @@ -59,7 +59,7 @@ void NoteBlockTile::attack(Level* level, int x, int y, int z, } std::shared_ptr NoteBlockTile::newTileEntity(Level* level) { - return std::shared_ptr(new MusicTileEntity()); + return std::make_shared(); } bool NoteBlockTile::triggerEvent(Level* level, int x, int y, int z, int i, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PumpkinTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PumpkinTile.cpp index 1a43e1deb..62b16fefe 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PumpkinTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PumpkinTile.cpp @@ -51,7 +51,7 @@ void PumpkinTile::onPlace(Level* level, int x, int y, int z) { level->setTileAndData(x, y - 1, z, 0, 0, Tile::UPDATE_CLIENTS); level->setTileAndData(x, y - 2, z, 0, 0, Tile::UPDATE_CLIENTS); std::shared_ptr snowMan = - std::shared_ptr(new SnowMan(level)); + std::make_shared(level); snowMan->moveTo(x + 0.5, y - 1.95, z + 0.5, 0, 0); level->addEntity(snowMan); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneOreTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneOreTile.cpp index 34eb6150a..64dd7e42e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneOreTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneOreTile.cpp @@ -117,5 +117,5 @@ bool RedStoneOreTile::shouldTileTick(Level* level, int x, int y, int z) { std::shared_ptr RedStoneOreTile::getSilkTouchItemInstance( int data) { - return std::shared_ptr(new ItemInstance(Tile::redStoneOre)); + return std::make_shared(Tile::redStoneOre); } \ No newline at end of file diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SignTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SignTile.cpp index 059547485..28f8a9bca 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SignTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SignTile.cpp @@ -73,7 +73,7 @@ std::shared_ptr SignTile::newTileEntity(Level* level) { // try { // 4J Stu - For some reason the newInstance wasn't working right, but doing // it like the other TileEntities is fine - return std::shared_ptr(new SignTileEntity()); + return std::make_shared(); // return std::dynamic_pointer_cast( clas->newInstance() ); // } catch (Exception e) { // TODO 4J Stu - Exception handling diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SkullTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SkullTile.cpp index 78398c88e..d8a000064 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SkullTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SkullTile.cpp @@ -60,7 +60,7 @@ void SkullTile::setPlacedBy(Level* level, int x, int y, int z, } std::shared_ptr SkullTile::newTileEntity(Level* level) { - return std::shared_ptr(new SkullTileEntity()); + return std::make_shared(); } int SkullTile::cloneTileId(Level* level, int x, int y, int z) { @@ -164,7 +164,7 @@ void SkullTile::checkMobSpawn(Level* level, int x, int y, int z, // 4J: Removed !isClientSide check because there's one // earlier on std::shared_ptr witherBoss = - std::shared_ptr(new WitherBoss(level)); + std::make_shared(level); witherBoss->moveTo(x + 0.5, y - 1.45, z + zo + 1.5, 90, 0); witherBoss->yBodyRot = 90; witherBoss->makeInvulnerable(); @@ -181,11 +181,11 @@ void SkullTile::checkMobSpawn(Level* level, int x, int y, int z, level, x, y - 1, z + zo + 2, 0, 0); std::shared_ptr itemInstance = - std::shared_ptr(new ItemInstance( - Item::skull_Id, 3, SkullTileEntity::TYPE_WITHER)); + std::make_shared( + Item::skull_Id, 3, SkullTileEntity::TYPE_WITHER); std::shared_ptr itemEntity = - std::shared_ptr(new ItemEntity( - level, x, y, z + zo + 1, itemInstance)); + std::make_shared( + level, x, y, z + zo + 1, itemInstance); level->addEntity(itemEntity); } @@ -246,7 +246,7 @@ void SkullTile::checkMobSpawn(Level* level, int x, int y, int z, // 4J: Removed !isClientSide check because there's one // earlier on std::shared_ptr witherBoss = - std::shared_ptr(new WitherBoss(level)); + std::make_shared(level); witherBoss->moveTo(x + xo + 1.5, y - 1.45, z + .5, 0, 0); witherBoss->makeInvulnerable(); level->addEntity(witherBoss); @@ -262,11 +262,11 @@ void SkullTile::checkMobSpawn(Level* level, int x, int y, int z, level, x + xo + 2, y - 1, z, 0, 0); std::shared_ptr itemInstance = - std::shared_ptr(new ItemInstance( - Item::skull_Id, 3, SkullTileEntity::TYPE_WITHER)); + std::make_shared( + Item::skull_Id, 3, SkullTileEntity::TYPE_WITHER); std::shared_ptr itemEntity = - std::shared_ptr(new ItemEntity( - level, x + xo + 1, y, z, itemInstance)); + std::make_shared( + level, x + xo + 1, y, z, itemInstance); level->addEntity(itemEntity); } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StemTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StemTile.cpp index 7c806ccf8..655e7377a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StemTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StemTile.cpp @@ -188,7 +188,7 @@ void StemTile::spawnResources(Level* level, int x, int y, int z, int data, if (fruit == Tile::melon) seed = Item::seeds_melon; for (int i = 0; i < 3; i++) { popResource(level, x, y, z, - std::shared_ptr(new ItemInstance(seed))); + std::make_shared(seed)); } } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneMonsterTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneMonsterTile.cpp index 810357283..ebaf358dd 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneMonsterTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneMonsterTile.cpp @@ -43,7 +43,7 @@ void StoneMonsterTile::destroy(Level* level, int x, int y, int z, int data) { // Also limit the amount of silverfish specifically if (level->countInstanceOf(eTYPE_SILVERFISH, true) < 15) { std::shared_ptr silverfish = - std::shared_ptr(new Silverfish(level)); + std::make_shared(level); silverfish->moveTo(x + .5, y, z + .5, 0, 0); level->addEntity(silverfish); @@ -91,7 +91,7 @@ std::shared_ptr StoneMonsterTile::getSilkTouchItemInstance( if (data == HOST_STONEBRICK) { tile = Tile::stoneBrick; } - return std::shared_ptr(new ItemInstance(tile)); + return std::make_shared(tile); } int StoneMonsterTile::cloneTileData(Level* level, int x, int y, int z) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ThinFenceTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ThinFenceTile.cpp index ff9741056..8a5a59115 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ThinFenceTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ThinFenceTile.cpp @@ -118,7 +118,7 @@ bool ThinFenceTile::isSilkTouchable() { return true; } std::shared_ptr ThinFenceTile::getSilkTouchItemInstance( int data) { - return std::shared_ptr(new ItemInstance(id, 1, data)); + return std::make_shared(id, 1, data); } void ThinFenceTile::registerIcons(IconRegister* iconRegister) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.cpp index ca19934d1..f49c9fc4c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.cpp @@ -2081,8 +2081,8 @@ void Tile::spawnResources(Level* level, int x, int y, int z, int data, if (type <= 0) continue; popResource(level, x, y, z, - std::shared_ptr(new ItemInstance( - type, 1, getSpawnResourcesAuxValue(data)))); + std::make_shared( + type, 1, getSpawnResourcesAuxValue(data))); } } @@ -2387,7 +2387,7 @@ std::shared_ptr Tile::getSilkTouchItemInstance(int data) { Item::items[id]->isStackedByData()) { popData = data; } - return std::shared_ptr(new ItemInstance(id, 1, popData)); + return std::make_shared(id, 1, popData); } int Tile::getResourceCountForLootBonus(int bonusLevel, Random* random) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TopSnowTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TopSnowTile.cpp index 44d142f29..0d968fe89 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TopSnowTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TopSnowTile.cpp @@ -94,7 +94,7 @@ void TopSnowTile::playerDestroy(Level* level, std::shared_ptr player, int height = data & HEIGHT_MASK; popResource( level, x, y, z, - std::shared_ptr(new ItemInstance(type, height + 1, 0))); + std::make_shared(type, height + 1, 0)); level->removeTile(x, y, z); } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/VineTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/VineTile.cpp index bd9b49dda..848c80457 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/VineTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/VineTile.cpp @@ -381,7 +381,7 @@ void VineTile::playerDestroy(Level* level, std::shared_ptr player, // drop leaf block instead of sapling popResource( level, x, y, z, - std::shared_ptr(new ItemInstance(Tile::vine, 1, 0))); + std::make_shared(Tile::vine, 1, 0)); } else { Tile::playerDestroy(level, player, x, y, z, data); } diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.cpp index 82c9d2b38..7a21e0c9e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.cpp @@ -10,7 +10,7 @@ std::shared_ptr BeaconTileEntity::clone() { std::shared_ptr result = - std::shared_ptr(new BeaconTileEntity()); + std::make_shared(); TileEntity::clone(result); result->primaryPower = primaryPower; @@ -204,8 +204,8 @@ void BeaconTileEntity::setSecondaryPower(int secondaryPower) { std::shared_ptr BeaconTileEntity::getUpdatePacket() { CompoundTag* tag = new CompoundTag(); save(tag); - return std::shared_ptr(new TileEntityDataPacket( - x, y, z, TileEntityDataPacket::TYPE_BEACON, tag)); + return std::make_shared( + x, y, z, TileEntityDataPacket::TYPE_BEACON, tag); } double BeaconTileEntity::getViewDistance() { return 256 * 256; } @@ -245,8 +245,8 @@ std::shared_ptr BeaconTileEntity::removeItem(unsigned int slot, return returnItem; } else { paymentItem->count -= count; - return std::shared_ptr(new ItemInstance( - paymentItem->id, count, paymentItem->getAuxValue())); + return std::make_shared( + paymentItem->id, count, paymentItem->getAuxValue()); } } return nullptr; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp index d3bf29855..410add4b9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp @@ -220,8 +220,8 @@ void BrewingStandTileEntity::doBrew() { } if (Item::items[ingredient->id]->hasCraftingRemainingItem()) { - items[INGREDIENT_SLOT] = std::shared_ptr(new ItemInstance( - Item::items[ingredient->id]->getCraftingRemainingItem())); + items[INGREDIENT_SLOT] = std::make_shared( + Item::items[ingredient->id]->getCraftingRemainingItem()); } else { items[INGREDIENT_SLOT]->count--; if (items[INGREDIENT_SLOT]->count <= 0) { @@ -405,7 +405,7 @@ bool BrewingStandTileEntity::canTakeItemThroughFace( // 4J Added std::shared_ptr BrewingStandTileEntity::clone() { std::shared_ptr result = - std::shared_ptr(new BrewingStandTileEntity()); + std::make_shared(); TileEntity::clone(result); result->brewTime = brewTime; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.cpp index 71ad65233..2e56213cd 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.cpp @@ -376,7 +376,7 @@ int ChestTileEntity::getType() { // 4J Added std::shared_ptr ChestTileEntity::clone() { std::shared_ptr result = - std::shared_ptr(new ChestTileEntity()); + std::make_shared(); TileEntity::clone(result); for (unsigned int i = 0; i < items->size(); i++) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/CommandBlockEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/CommandBlockEntity.cpp index 786749342..5208478ed 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/CommandBlockEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/CommandBlockEntity.cpp @@ -64,8 +64,8 @@ Level* CommandBlockEntity::getCommandSenderWorld() { return getLevel(); } std::shared_ptr CommandBlockEntity::getUpdatePacket() { CompoundTag* tag = new CompoundTag(); save(tag); - return std::shared_ptr(new TileEntityDataPacket( - x, y, z, TileEntityDataPacket::TYPE_ADV_COMMAND, tag)); + return std::make_shared( + x, y, z, TileEntityDataPacket::TYPE_ADV_COMMAND, tag); } int CommandBlockEntity::getSuccessCount() { return successCount; } @@ -77,7 +77,7 @@ void CommandBlockEntity::setSuccessCount(int successCount) { // 4J Added std::shared_ptr CommandBlockEntity::clone() { std::shared_ptr result = - std::shared_ptr(new CommandBlockEntity()); + std::make_shared(); TileEntity::clone(result); result->successCount = successCount; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp index 626fe3661..60474a7fe 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp @@ -22,7 +22,7 @@ void ComparatorTileEntity::setOutputSignal(int value) { output = value; } // 4J Added std::shared_ptr ComparatorTileEntity::clone() { std::shared_ptr result = - std::shared_ptr(new ComparatorTileEntity()); + std::make_shared(); TileEntity::clone(result); result->output = output; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.cpp index 11a93efc5..2e6faa4fb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.cpp @@ -187,7 +187,7 @@ bool DispenserTileEntity::canPlaceItem(int slot, // 4J Added std::shared_ptr DispenserTileEntity::clone() { std::shared_ptr result = - std::shared_ptr(new DispenserTileEntity()); + std::make_shared(); TileEntity::clone(result); for (unsigned int i = 0; i < items.size(); i++) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DropperTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DropperTileEntity.cpp index d05d07862..fb20a7c78 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DropperTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DropperTileEntity.cpp @@ -9,7 +9,7 @@ std::wstring DropperTileEntity::getName() { // 4J Added std::shared_ptr DropperTileEntity::clone() { std::shared_ptr result = - std::shared_ptr(new DropperTileEntity()); + std::make_shared(); TileEntity::clone(result); result->name = name; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp index 6be70627f..6ee8f161f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp @@ -99,7 +99,7 @@ void EnchantmentTableEntity::setCustomName(const std::wstring& name) { std::shared_ptr EnchantmentTableEntity::clone() { std::shared_ptr result = - std::shared_ptr(new EnchantmentTableEntity()); + std::make_shared(); TileEntity::clone(result); result->time = time; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp index 95ec43007..ccc6f6d43 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp @@ -93,7 +93,7 @@ bool EnderChestTileEntity::stillValid(std::shared_ptr player) { // 4J Added std::shared_ptr EnderChestTileEntity::clone() { std::shared_ptr result = - std::shared_ptr(new EnderChestTileEntity()); + std::make_shared(); TileEntity::clone(result); return result; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp index 25235d3d7..411d8c28a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp @@ -332,7 +332,7 @@ bool FurnaceTileEntity::canTakeItemThroughFace( // 4J Added std::shared_ptr FurnaceTileEntity::clone() { std::shared_ptr result = - std::shared_ptr(new FurnaceTileEntity()); + std::make_shared(); TileEntity::clone(result); result->litTime = litTime; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.cpp index 0b636c6bf..2c8767b2f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.cpp @@ -422,7 +422,7 @@ bool HopperTileEntity::isOnCooldown() { return cooldownTime > 0; } // 4J Added std::shared_ptr HopperTileEntity::clone() { std::shared_ptr result = - std::shared_ptr(new HopperTileEntity()); + std::make_shared(); TileEntity::clone(result); result->name = name; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp index f9228c8a2..a897844f3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp @@ -60,8 +60,8 @@ std::shared_ptr MobSpawnerTileEntity::getUpdatePacket() { CompoundTag* tag = new CompoundTag(); save(tag); tag->remove(L"SpawnPotentials"); - return std::shared_ptr(new TileEntityDataPacket( - x, y, z, TileEntityDataPacket::TYPE_MOB_SPAWNER, tag)); + return std::make_shared( + x, y, z, TileEntityDataPacket::TYPE_MOB_SPAWNER, tag); } bool MobSpawnerTileEntity::triggerEvent(int b0, int b1) { @@ -74,7 +74,7 @@ BaseMobSpawner* MobSpawnerTileEntity::getSpawner() { return spawner; } // 4J Added std::shared_ptr MobSpawnerTileEntity::clone() { std::shared_ptr result = - std::shared_ptr(new MobSpawnerTileEntity()); + std::make_shared(); TileEntity::clone(result); return result; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MusicTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MusicTileEntity.cpp index c474d2faa..f2e722698 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MusicTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/MusicTileEntity.cpp @@ -48,7 +48,7 @@ void MusicTileEntity::playNote(Level* level, int x, int y, int z) { // 4J Added std::shared_ptr MusicTileEntity::clone() { std::shared_ptr result = - std::shared_ptr(new MusicTileEntity()); + std::make_shared(); TileEntity::clone(result); result->note = note; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp index 3db8a4688..b28db5319 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp @@ -168,7 +168,7 @@ void PistonPieceEntity::save(CompoundTag* tag) { // 4J Added std::shared_ptr PistonPieceEntity::clone() { std::shared_ptr result = - std::shared_ptr(new PistonPieceEntity()); + std::make_shared(); TileEntity::clone(result); result->id = id; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.cpp index 700f69e10..4cd8c2e2b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.cpp @@ -172,7 +172,7 @@ int SignTileEntity::StringVerifyCallback(void* lpParam, // 4J Added std::shared_ptr SignTileEntity::clone() { std::shared_ptr result = - std::shared_ptr(new SignTileEntity()); + std::make_shared(); TileEntity::clone(result); result->m_wsmessages[0] = m_wsmessages[0]; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SkullTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SkullTileEntity.cpp index 7a4dbbce2..3b0a3d367 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SkullTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/SkullTileEntity.cpp @@ -29,8 +29,8 @@ void SkullTileEntity::load(CompoundTag* tag) { std::shared_ptr SkullTileEntity::getUpdatePacket() { CompoundTag* tag = new CompoundTag(); save(tag); - return std::shared_ptr(new TileEntityDataPacket( - x, y, z, TileEntityDataPacket::TYPE_SKULL, tag)); + return std::make_shared( + x, y, z, TileEntityDataPacket::TYPE_SKULL, tag); } void SkullTileEntity::setSkullType(int skullType, const std::wstring& extra) { @@ -49,7 +49,7 @@ std::wstring SkullTileEntity::getExtraType() { return extraType; } // 4J Added std::shared_ptr SkullTileEntity::clone() { std::shared_ptr result = - std::shared_ptr(new SkullTileEntity()); + std::make_shared(); TileEntity::clone(result); result->skullType = skullType; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTile.cpp index f917ea083..c2965ade7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTile.cpp @@ -30,7 +30,7 @@ TheEndPortal::TheEndPortal(int id, Material* material) } std::shared_ptr TheEndPortal::newTileEntity(Level* level) { - return std::shared_ptr(new TheEndPortalTileEntity()); + return std::make_shared(); } void TheEndPortal::updateShape( diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTileEntity.cpp index f5f82d410..2718dd522 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTileEntity.cpp @@ -6,7 +6,7 @@ // 4J Added std::shared_ptr TheEndPortalTileEntity::clone() { std::shared_ptr result = - std::shared_ptr(new TheEndPortalTileEntity()); + std::make_shared(); TileEntity::clone(result); return result; } \ No newline at end of file