Skip to content

Commit

Permalink
Fix code style in items.cpp (#2484)
Browse files Browse the repository at this point in the history
* prevent crafted packets from inviting yourself to a party

* Merge remote-tracking branch 'upstream/master'

* fix code style

* ffs
  • Loading branch information
Sascha Striegel authored and WibbenZ committed Jul 15, 2018
1 parent 709fb34 commit 3b63f65
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions src/items.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -190,25 +190,25 @@ const std::unordered_map<std::string, WeaponType_t> WeaponTypesMap = {
};

const std::unordered_map<std::string, FluidTypes_t> FluidTypesMap = {
{"water", FLUID_WATER },
{"water", FLUID_WATER},
{"blood", FLUID_BLOOD},
{"beer", FLUID_BEER},
{"slime", FLUID_SLIME},
{"lemonade", FLUID_LEMONADE},
{"milk", FLUID_MILK },
{"mana", FLUID_MANA },
{"life", FLUID_LIFE },
{"oil", FLUID_OIL },
{"urine", FLUID_URINE },
{"coconut", FLUID_COCONUTMILK },
{"wine", FLUID_WINE },
{"mud", FLUID_MUD },
{"fruitjuice", FLUID_FRUITJUICE },
{"lava", FLUID_LAVA },
{"rum", FLUID_RUM },
{"swamp", FLUID_SWAMP },
{"tea", FLUID_TEA },
{"mead", FLUID_MEAD },
{"milk", FLUID_MILK},
{"mana", FLUID_MANA},
{"life", FLUID_LIFE},
{"oil", FLUID_OIL},
{"urine", FLUID_URINE},
{"coconut", FLUID_COCONUTMILK},
{"wine", FLUID_WINE},
{"mud", FLUID_MUD},
{"fruitjuice", FLUID_FRUITJUICE},
{"lava", FLUID_LAVA},
{"rum", FLUID_RUM},
{"swamp", FLUID_SWAMP},
{"tea", FLUID_TEA},
{"mead", FLUID_MEAD},
};


Expand Down

0 comments on commit 3b63f65

Please sign in to comment.