diff options
| author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-30 18:53:54 +0200 |
|---|---|---|
| committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-30 18:55:43 +0200 |
| commit | 4ef9c7675ada82961d83601712a47ebad78b67b5 (patch) | |
| tree | cdfd863219a8dc1031e727740e7d895296c5855d /src/inventory.cpp | |
| parent | f69123050b62ada635751b7155bb6822b0a97a9b (diff) | |
| parent | dbea511a6f877450cfd5adb86efa55a8f00cc9a1 (diff) | |
| download | minetest-4ef9c7675ada82961d83601712a47ebad78b67b5.tar.gz minetest-4ef9c7675ada82961d83601712a47ebad78b67b5.tar.bz2 minetest-4ef9c7675ada82961d83601712a47ebad78b67b5.zip | |
Merge remote-tracking branch 'origin/upstream'
Diffstat (limited to 'src/inventory.cpp')
| -rw-r--r-- | src/inventory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/inventory.cpp b/src/inventory.cpp index fec51a759..7ef7f0138 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -61,7 +61,7 @@ InventoryItem* InventoryItem::deSerialize(std::istream &is) is>>material; u16 count; is>>count; - if(material > 255) + if(material > MAX_CONTENT) throw SerializationError("Too large material number"); return new MaterialItem(material, count); } |