diff options
| author | ModMaker101 <119018978+ModMaker101@users.noreply.github.com> | 2026-03-08 19:08:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-08 18:08:36 -0500 |
| commit | 28614b922fb77149a54da1a87bebfbc98736f296 (patch) | |
| tree | 7f828ba86a4ee18d0a80d29de64f6199a5412512 /Minecraft.World/SimpleContainer.cpp | |
| parent | 88798b501d0cf6287b6f87acb2592676e3cec58d (diff) | |
Modernize project codebase (#906)
* Fixed boats falling and a TP glitch #266
* Replaced every C-style cast with C++ ones
* Replaced every C-style cast with C++ ones
* Fixed boats falling and a TP glitch #266
* Updated NULL to nullptr and fixing some type issues
* Modernized and fixed a few bugs
- Replaced most instances of `NULL` with `nullptr`.
- Replaced most `shared_ptr(new ...)` with `make_shared`.
- Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances.
* Fixing more conflicts
* Replace int loops with size_t and start work on overrides
* Add safety checks and fix a issue with vector going OOR
Diffstat (limited to 'Minecraft.World/SimpleContainer.cpp')
| -rw-r--r-- | Minecraft.World/SimpleContainer.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Minecraft.World/SimpleContainer.cpp b/Minecraft.World/SimpleContainer.cpp index a5f551e2..87d11a70 100644 --- a/Minecraft.World/SimpleContainer.cpp +++ b/Minecraft.World/SimpleContainer.cpp @@ -13,12 +13,12 @@ SimpleContainer::SimpleContainer(int name, wstring stringName, bool customName, this->size = size; items = new ItemInstanceArray( size ); - listeners = NULL; + listeners = nullptr; } void SimpleContainer::addListener(net_minecraft_world::ContainerListener *listener) { - if (listeners == NULL) listeners = new vector<net_minecraft_world::ContainerListener *>(); + if (listeners == nullptr) listeners = new vector<net_minecraft_world::ContainerListener *>(); listeners->push_back(listener); } @@ -43,7 +43,7 @@ shared_ptr<ItemInstance> SimpleContainer::getItem(unsigned int slot) shared_ptr<ItemInstance> SimpleContainer::removeItem(unsigned int slot, int count) { - if ((*items)[slot] != NULL) { + if ((*items)[slot] != nullptr) { if ((*items)[slot]->count <= count) { shared_ptr<ItemInstance> item = (*items)[slot]; @@ -64,7 +64,7 @@ shared_ptr<ItemInstance> SimpleContainer::removeItem(unsigned int slot, int coun shared_ptr<ItemInstance> SimpleContainer::removeItemNoUpdate(int slot) { - if ((*items)[slot] != NULL) + if ((*items)[slot] != nullptr) { shared_ptr<ItemInstance> item = (*items)[slot]; (*items)[slot] = nullptr; @@ -76,7 +76,7 @@ shared_ptr<ItemInstance> SimpleContainer::removeItemNoUpdate(int slot) void SimpleContainer::setItem(unsigned int slot, shared_ptr<ItemInstance> item) { (*items)[slot] = item; - if (item != NULL && item->count > getMaxStackSize()) item->count = getMaxStackSize(); + if (item != nullptr && item->count > getMaxStackSize()) item->count = getMaxStackSize(); setChanged(); } @@ -113,7 +113,7 @@ int SimpleContainer::getMaxStackSize() const void SimpleContainer::setChanged() { - if (listeners != NULL) for (unsigned int i = 0; i < listeners->size(); i++) + if (listeners != nullptr) for (unsigned int i = 0; i < listeners->size(); i++) { listeners->at(i)->containerChanged();//shared_from_this()); } |
